summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 8e1a8753: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
|\
| * Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
| |\
| | * JOO40BThe Android Automerger2012-08-091-1/+1
| | * JOO40The Android Automerger2012-08-091-13/+3
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | |\
| | | * JOO39BThe Android Automerger2012-08-081-1/+1
* | | | am 623a098c: am c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-devKenny Root2012-08-091-0/+1
|\ \ \ \ | |/ / /
| * | | am c2872a62: Merge "Add make_ext4fs to all builds" into jb-mr1-devKenny Root2012-08-091-0/+1
| |\ \ \
| | * \ \ Merge "Add make_ext4fs to all builds" into jb-mr1-devKenny Root2012-08-091-0/+1
| | |\ \ \
| | | * | | Add make_ext4fs to all buildsKenny Root2012-08-091-0/+1
| | | |/ /
* | | | | am c8d8a1e6: am 72f0b676: tidy up building of recovery ramdisk imageDoug Zongker2012-08-091-19/+18
|\ \ \ \ \ | |/ / / /
| * | | | am 72f0b676: tidy up building of recovery ramdisk imageDoug Zongker2012-08-091-19/+18
| |\ \ \ \ | | |/ / /
| | * | | tidy up building of recovery ramdisk imageDoug Zongker2012-08-091-19/+18
| | |/ /
* | | | am 7aeaaa04: am e98b836f: Merge "recovery: don\'t delete hardware specific in...Colin Cross2012-08-081-1/+1
|\ \ \ \ | |/ / /
| * | | am e98b836f: Merge "recovery: don\'t delete hardware specific init*.rc files"...Colin Cross2012-08-081-1/+1
| |\ \ \ | | |/ /
| | * | Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-devColin Cross2012-08-081-1/+1
| | |\ \
| | | * | recovery: don't delete hardware specific init*.rc filesColin Cross2012-08-081-1/+1
* | | | | am e1770f5f: am 9c649a75: Don\'t install overridden packages in pdk fusion fi...Ying Wang2012-08-081-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 9c649a75: Don\'t install overridden packages in pdk fusion files.Ying Wang2012-08-081-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Don't install overridden packages in pdk fusion files.Ying Wang2012-08-081-1/+5
* | | | | am f5bbfe82: am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for ...Jean-Baptiste Queru2012-08-082-17/+19
|\ \ \ \ \ | |/ / / /
| * | | | am b0cc9aae: am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
| |\ \ \ \ | | |/ / /
| | * | | am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
| | |\ \ \
| | | * \ \ am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
| | | |\ \ \
| | | | * \ \ Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-082-17/+19
| | | | |\ \ \
| | | | | * | | x86: cleanups for toolchainBruce Beare2012-07-172-17/+19
* | | | | | | | am 61c4a50e: am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Do...Jean-Baptiste Queru2012-08-081-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1870b7f4: am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC ...Jean-Baptiste Queru2012-08-081-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"Jean-Baptiste Queru2012-08-081-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"Jean-Baptiste Queru2012-08-081-4/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "definitions.mk: Don't use GCC '@' parameter"Jean-Baptiste Queru2012-08-081-4/+4
| | | | |\ \ \ \
| | | | | * | | | definitions.mk: Don't use GCC '@' parameterAndrew Boie2012-07-261-4/+4
* | | | | | | | | am 98092627: am 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: als...Jean-Baptiste Queru2012-08-081-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7de61d14: am 04363aa5: am af541a64: Merge "core/Makefile: also look for de...Jean-Baptiste Queru2012-08-081-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/...Jean-Baptiste Queru2012-08-081-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"Jean-Baptiste Queru2012-08-081-0/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge "core/Makefile: also look for device/*/build/tasks"Jean-Baptiste Queru2012-08-081-0/+1
| | | | |\ \ \ \ \
| | | | | * | | | | core/Makefile: also look for device/*/build/tasksAndrew Boie2012-07-171-0/+1
* | | | | | | | | | am 4587a9c2: am 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages ...Scott Main2012-08-082-7/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image spa...Scott Main2012-08-082-7/+12
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full pa...Scott Main2012-08-082-7/+12
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | am 0e71cee2: docs: make landing pages w/o image span the full page widthScott Main2012-08-082-7/+12
| | | |\ \ \ \ \ \
| | | | * | | | | | docs: make landing pages w/o image span the full page widthScott Main2012-08-072-7/+12
* | | | | | | | | | Remove libastl and libastl_host from the grandfathered list.Elliott Hughes2012-08-081-2/+0
* | | | | | | | | | Merge "Remove the obsolete bin2asm tool."Elliott Hughes2012-08-085-150/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove the obsolete bin2asm tool.Elliott Hughes2012-08-085-150/+0
* | | | | | | | | | | am 094c637b: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | JOO39The Android Automerger2012-08-081-13/+3
| | * | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |