summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 424e8787: am 91789538: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-090-0/+0
|\ | | | | | | * commit '424e8787c958829fed7f5020f23e4a02b86d0ec4':
| * am 91789538: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ | | | | | | | | | * commit '917895384fb7c9fb9ca858fdf792ec165e151de9':
| | * Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-080-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288
* | | \ am 374011a7: (-s ours) Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit '374011a72ef62b2381235f07fb9117fbb03f12c7': IML69 ICL53F IML67B
| | | |
| | \ \
| *-. \ \ Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I7bc70364e017d1c67bcc4b308e0aff5eaa19e661
| | | * | IML69The Android Automerger2011-12-081-13/+3
| | | | |
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * IML67BThe Android Automerger2011-12-071-1/+1
| | | | |
| | * | | ICL53FThe Android Automerger2011-12-071-1/+1
| | | | |
* | | | | Merge "Use ARM TLS register for emulator"Kenny Root2011-12-091-0/+1
|\ \ \ \ \
| * | | | | Use ARM TLS register for emulatorKenny Root2011-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is dependent on having a kernel that uses CONFIG_HAS_TLS_REG=y which is enabled in change Ic497e41270a4ad78ca55ab5674b5342e8d939e56 Change-Id: I456c270dd5b4d8fedfb423ac8e363fd37b77f8ce
* | | | | | Merge "Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS."Stephen Hines2011-12-073-0/+8
|\ \ \ \ \ \
| * | | | | | Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.Stephen Hines2011-12-073-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
* | | | | | | resolved conflicts for merge of d7b15982 to masterDianne Hackborn2011-12-070-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | Change-Id: Iaa744477dd64e9833888f72186ec0676e99f28e4
| * | | | | am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.Dianne Hackborn2011-12-072-1/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3': Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
| | * | | | Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.Dianne Hackborn2011-12-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | Change-Id: Ib6c72245d2135fe255c5dada01754cb5e03d761c
| * | | | | IML67The Android Automerger2011-12-061-13/+3
| | | | | |
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-060-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am e3bdf69c: am febd861a: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'e3bdf69cc6af9a7deec5a44823e5a0a2e1f16064': ICL53E
| * | | | | | am febd861a: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'febd861a073b0500b6e7f0ea117b71df3bc6822c': ICL53E
| | * | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19
| | | * | | ICL53EThe Android Automerger2011-12-061-1/+1
| | | | | |
* | | | | | am 0cd997ff: am 8af0efd6: Improve handling of absolute paths in out directoryJean-Baptiste Queru2011-12-061-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0cd997ff31852af80eab4f3d0c2db8d1a1328085': Improve handling of absolute paths in out directory
| * | | | | am 8af0efd6: Improve handling of absolute paths in out directoryJean-Baptiste Queru2011-12-061-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8af0efd6a157e682d88c9a6e030f37bab9860caf': Improve handling of absolute paths in out directory
| | * | | | | Improve handling of absolute paths in out directoryJean-Baptiste Queru2011-12-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
* | | | | | | am 78b68045: am ffe03c98: Set OUT_DIR based on a common base pathJean-Baptiste Queru2011-12-062-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '78b680458b3ba53fb2f88a603e371c002eb8944b': Set OUT_DIR based on a common base path
| * | | | | | am ffe03c98: Set OUT_DIR based on a common base pathJean-Baptiste Queru2011-12-062-0/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c': Set OUT_DIR based on a common base path
| | * | | | | Set OUT_DIR based on a common base pathJean-Baptiste Queru2011-12-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9 Author: Jean-Baptiste Queru<jbq@google.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-060-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: Ib87b7762bfc1eca5386bfc50c687547c6141dc29
| * | | | | | IML66The Android Automerger2011-12-051-13/+3
| | | | | | |
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am da4a1fc2: am aac7b445: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | * commit 'da4a1fc216429a44c1befaf27f73350af2527a67': ICL53D
| * | | | | | am aac7b445: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'aac7b4455a4dbfab5a136628864789eba8a31bb0': ICL53D
| | * | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-060-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | Change-Id: I224ac8e665f91c64935f7a20397b925aba767994
| | | * | | ICL53DThe Android Automerger2011-12-061-1/+1
| | | | | |
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-050-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: Ia3ed1074e701cb1a74e3af1906ef3897fc293fd0
| * | | | | IML63BThe Android Automerger2011-12-021-13/+3
| | | | | |
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | IML63The Android Automerger2011-12-021-13/+3
| | | | | |
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 4eef1296: am bd2dadc2: check entire recovery partition on startupDoug Zongker2011-12-020-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '4eef12965b5dc39ba87eb71ac3548cc2ec8af729': check entire recovery partition on startup
| * | | | | | am bd2dadc2: check entire recovery partition on startupDoug Zongker2011-12-021-8/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bd2dadc21a5db967972a7b8f81aad716609edacb': check entire recovery partition on startup
| | * | | | | check entire recovery partition on startupDoug Zongker2011-12-021-8/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checksum the entire recovery partition at boot time to see if we need to rewrite it, rather than just the first 2kb. Bug: 5668350 Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
* | | | | | Merge "check entire recovery partition on startup"Doug Zongker2011-12-021-8/+1
|\ \ \ \ \ \
| * | | | | | check entire recovery partition on startupDoug Zongker2011-12-021-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checksum the entire recovery partition at boot time to see if we need to rewrite it, rather than just the first 2kb. Bug: 5668350 Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
* | | | | | | Print more info of the image size stats.Ying Wang2011-12-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5620615 Before this change it only reports the limit if the real size exceeeds or approaches the limit. Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-020-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Change-Id: I7652f038082b7a8de4a210854f755c3127f3370a
| * | | | | IML62BThe Android Automerger2011-12-011-13/+3
| | | | | |
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| |\ \ \ \ \
generated by cgit v1.1 at 2025-03-23 23:06:58 +0000