summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aospKenny Root2012-10-1611-53/+4
|\
| * resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aospKenny Root2012-10-1611-53/+4
| |\
| | * Merge "Remove HAVE_SELINUX guards"Kenny Root2012-10-1611-53/+4
| | |\
| | | * Remove HAVE_SELINUX guardsKenny Root2012-10-1611-53/+4
| | |/
* | | am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release -...The Android Open Source Project2012-10-100-0/+0
|\ \ \ | |/ /
| | |
| | \
| *-. \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-100-0/+0
| |\ \ \
| | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \
| | * | \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
* | | | | am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache"Devin Kim2012-10-091-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6016d08b: recovery: fix failure to unmount "/cache"Devin Kim2012-10-091-0/+1
| |\ \ \ \ | | |/ / /
| | * | | recovery: fix failure to unmount "/cache"Devin Kim2012-10-081-0/+1
* | | | | am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 8347cb2d: revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
| |\ \ \ \ | | |/ / /
| | * | | revert to tacky 3D recovery animationDoug Zongker2012-10-0867-4/+4
* | | | | am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am a8db3764: am 6c8553dd: display error state on OTA failureDoug Zongker2012-09-241-4/+13
|\ \ \ \ \ | |/ / / /
| * | | | am 6c8553dd: display error state on OTA failureDoug Zongker2012-09-241-4/+13
| |\ \ \ \ | | |/ / /
| | * | | display error state on OTA failureDoug Zongker2012-09-241-4/+13
* | | | | am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | tweak recovery text imagesDoug Zongker2012-09-185-1/+2
| | * | | localization for recovery messagesDoug Zongker2012-09-188-7/+53
* | | | | am 42afb545: am b66cb69e: tweak recovery text imagesDoug Zongker2012-09-185-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am b66cb69e: tweak recovery text imagesDoug Zongker2012-09-185-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | tweak recovery text imagesDoug Zongker2012-09-185-1/+2
* | | | | am ed3bc11e: am 5fa8c239: localization for recovery messagesDoug Zongker2012-09-188-7/+53
|\ \ \ \ \ | |/ / / /
| * | | | am 5fa8c239: localization for recovery messagesDoug Zongker2012-09-188-7/+53
| |\ \ \ \ | | |/ / /
| | * | | localization for recovery messagesDoug Zongker2012-09-188-7/+53
* | | | | am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | |\ \ | |/ / /
| | * | fix format of installing_textDoug Zongker2012-08-301-0/+0
* | | | am 52eeea4f: minor recovery fixesDoug Zongker2012-09-043-10/+13
|\ \ \ \ | |/ / /
| * | | minor recovery fixesDoug Zongker2012-09-043-10/+13
* | | | am f4c6ec84: fix format of installing_textDoug Zongker2012-08-301-0/+0
|\ \ \ \ | |/ / /
| * | | fix format of installing_textDoug Zongker2012-08-301-0/+0
| |/ /
* | | am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-devDoug Zongker2012-08-296-9/+1
|\ \ \ | |/ /
| * | Merge "recovery locale handling fixes" into jb-mr1-devDoug Zongker2012-08-296-9/+1
| |\ \
| | * | recovery locale handling fixesDoug Zongker2012-08-296-9/+1
* | | | am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
|\ \ \ \ | |/ / /
| * | | am bddbb5b3: Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Fixing trivial warnings for libminui"Jean-Baptiste Queru2012-08-241-2/+2
| | |\ \
| | | * | Fixing trivial warnings for libminuiEdwin Vane2012-08-211-2/+2
* | | | | am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add libm due to libpng dependency." into jb-mr1-devStephen Hines2012-08-231-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |