Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp | Kenny Root | 2012-10-16 | 11 | -53/+4 | |
|\ | ||||||
| * | resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp | Kenny Root | 2012-10-16 | 11 | -53/+4 | |
| |\ | ||||||
| | * | Merge "Remove HAVE_SELINUX guards" | Kenny Root | 2012-10-16 | 11 | -53/+4 | |
| | |\ | ||||||
| | | * | Remove HAVE_SELINUX guards | Kenny Root | 2012-10-16 | 11 | -53/+4 | |
| | |/ | ||||||
* | | | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release -... | The Android Open Source Project | 2012-10-10 | 0 | -0/+0 | |
|\ \ \ | |/ / | ||||||
| | | | ||||||
| | \ | ||||||
| *-. \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-10 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 | |
| | | |\ \ | ||||||
| | * | \ \ | merge in jb-mr1-factory-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | ||||||
* | | | | | am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache" | Devin Kim | 2012-10-09 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 6016d08b: recovery: fix failure to unmount "/cache" | Devin Kim | 2012-10-09 | 1 | -0/+1 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | recovery: fix failure to unmount "/cache" | Devin Kim | 2012-10-08 | 1 | -0/+1 | |
* | | | | | am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-09 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-09 | 0 | -0/+0 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
* | | | | | am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animation | Doug Zongker | 2012-10-08 | 67 | -4/+4 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 8347cb2d: revert to tacky 3D recovery animation | Doug Zongker | 2012-10-08 | 67 | -4/+4 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | revert to tacky 3D recovery animation | Doug Zongker | 2012-10-08 | 67 | -4/+4 | |
* | | | | | am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-26 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-26 | 0 | -0/+0 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-25 | 0 | -0/+0 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
* | | | | | am a8db3764: am 6c8553dd: display error state on OTA failure | Doug Zongker | 2012-09-24 | 1 | -4/+13 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 6c8553dd: display error state on OTA failure | Doug Zongker | 2012-09-24 | 1 | -4/+13 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | display error state on OTA failure | Doug Zongker | 2012-09-24 | 1 | -4/+13 | |
* | | | | | am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-20 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-20 | 0 | -0/+0 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | tweak recovery text images | Doug Zongker | 2012-09-18 | 5 | -1/+2 | |
| | * | | | localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 | |
* | | | | | am 42afb545: am b66cb69e: tweak recovery text images | Doug Zongker | 2012-09-18 | 5 | -1/+2 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am b66cb69e: tweak recovery text images | Doug Zongker | 2012-09-18 | 5 | -1/+2 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | tweak recovery text images | Doug Zongker | 2012-09-18 | 5 | -1/+2 | |
* | | | | | am ed3bc11e: am 5fa8c239: localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 5fa8c239: localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | localization for recovery messages | Doug Zongker | 2012-09-18 | 8 | -7/+53 | |
* | | | | | am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Reconcile with jb-mr1-release - do not merge | The Android Open Source Project | 2012-09-06 | 0 | -0/+0 | |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | ||||||
| | * | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-05 | 0 | -0/+0 | |
| | |\ \ | |/ / / | ||||||
| | * | | fix format of installing_text | Doug Zongker | 2012-08-30 | 1 | -0/+0 | |
* | | | | am 52eeea4f: minor recovery fixes | Doug Zongker | 2012-09-04 | 3 | -10/+13 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | minor recovery fixes | Doug Zongker | 2012-09-04 | 3 | -10/+13 | |
* | | | | am f4c6ec84: fix format of installing_text | Doug Zongker | 2012-08-30 | 1 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | fix format of installing_text | Doug Zongker | 2012-08-30 | 1 | -0/+0 | |
| |/ / | ||||||
* | | | am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-dev | Doug Zongker | 2012-08-29 | 6 | -9/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Merge "recovery locale handling fixes" into jb-mr1-dev | Doug Zongker | 2012-08-29 | 6 | -9/+1 | |
| |\ \ | ||||||
| | * | | recovery locale handling fixes | Doug Zongker | 2012-08-29 | 6 | -9/+1 | |
* | | | | am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui" | Jean-Baptiste Queru | 2012-08-24 | 1 | -2/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | am bddbb5b3: Merge "Fixing trivial warnings for libminui" | Jean-Baptiste Queru | 2012-08-24 | 1 | -2/+2 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Merge "Fixing trivial warnings for libminui" | Jean-Baptiste Queru | 2012-08-24 | 1 | -2/+2 | |
| | |\ \ | ||||||
| | | * | | Fixing trivial warnings for libminui | Edwin Vane | 2012-08-21 | 1 | -2/+2 | |
* | | | | | am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-dev | Stephen Hines | 2012-08-23 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge "Add libm due to libpng dependency." into jb-mr1-dev | Stephen Hines | 2012-08-23 | 1 | -0/+1 | |
| |\ \ \ \ | | |_|_|/ | |/| | | |