summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* find pdk platform.zip from full_ directory as well for aosp_ productskeunyoung2013-03-281-5/+7
* Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-devBrian Carlstrom2013-03-281-0/+2
|\
| * resolved conflicts for merge of 9a3b17d1 to jb-mr2-devBrian Carlstrom2013-03-271-0/+2
| |\
| | * am 923ac1a8: Merge "Added local variable info output to javac command for hos...Brian Carlstrom2013-03-271-0/+2
| | |\
| | | * Merge "Added local variable info output to javac command for host build."Brian Carlstrom2013-03-271-0/+2
| | | |\
| | | | * Added local variable info output to javac command for host build.jeffhao2013-03-261-0/+2
| | | |/
* | | | Merge "Link RS compatibility files with libc and make bcc_compat a regular de...Stephen Hines2013-03-272-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Link RS compatibility files with libc and make bcc_compat a regular dep.Stephen Hines2013-03-272-2/+2
* | | | am 6c3f41ac: am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the nav...Scott Main2013-03-272-3/+11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am a6188a56: am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascri...Scott Main2013-03-272-3/+11
| |\ \
| | * \ am 972c3798: am 28ca0f32: am 25e7300c: load the navtree javascript on demand;...Scott Main2013-03-272-3/+11
| | |\ \
| | | * \ am 28ca0f32: am 25e7300c: load the navtree javascript on demand; don\'t try s...Scott Main2013-03-272-3/+11
| | | |\ \
| | | | * \ am 25e7300c: load the navtree javascript on demand; don\'t try setting up the...Scott Main2013-03-272-3/+11
| | | | |\ \
| | | | | * | load the navtree javascript on demand; don't try setting up the tree until it...Scott Main2013-03-272-3/+11
* | | | | | | Merge commit 'e8c9e82d' into manualmergerepo sync2013-03-261-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 50585e76: Merge "Add sepolicy and mac_perms to installclean"Geremy Condra2013-03-261-1/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "Add sepolicy and mac_perms to installclean"Geremy Condra2013-03-261-1/+3
| | |\ \ \ \ \
| | | * | | | | Add sepolicy and mac_perms to installcleanWilliam Roberts2013-03-261-1/+3
| | |/ / / / /
* | | | | | | Fix build - Add missing backslashJean-Baptiste Queru2013-03-261-1/+1
* | | | | | | Rename AOSP builds to aosp_*Jean-Baptiste Queru2013-03-2612-13/+105
* | | | | | | Allow to run Proguard on static Java libraryYing Wang2013-03-262-4/+27
* | | | | | | am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
| |\ \ \ \ \ \
| | * | | | | | JDQ39EThe Android Automerger2013-03-201-1/+1
| | * | | | | | JDQ39DThe Android Automerger2013-03-141-1/+1
| | * | | | | | JDQ39CThe Android Automerger2013-03-121-1/+1
* | | | | | | | am 964c6321: am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascri...Scott Main2013-03-251-1/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 709fcf04: am 2325250e: am 9ae6d37a: am de295276: add javascript action eve...Scott Main2013-03-251-1/+23
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 2325250e: am 9ae6d37a: am de295276: add javascript action events to search...Scott Main2013-03-251-1/+23
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | am 9ae6d37a: am de295276: add javascript action events to search suggestions ...Scott Main2013-03-251-1/+23
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | am de295276: add javascript action events to search suggestions and search re...Scott Main2013-03-251-1/+23
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | add javascript action events to search suggestions and search results.Scott Main2013-03-251-1/+23
* | | | | | | | Merge "Support to build vendor.img" into jb-mr2-devYing Wang2013-03-254-40/+131
|\ \ \ \ \ \ \ \
| * | | | | | | | Support to build vendor.imgYing Wang2013-03-254-40/+131
* | | | | | | | | Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr...Dima Zavin2013-03-251-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | core: combo: arm: use appropriate mcpu flags for cortex-a7Dima Zavin2013-03-231-0/+4
* | | | | | | | | am ca983c08: am 97c280ec: Merge "We have to use := instead of +="Ying Wang2013-03-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am 97c280ec: Merge "We have to use := instead of +="Ying Wang2013-03-221-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge "We have to use := instead of +="Ying Wang2013-03-231-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | We have to use := instead of +=Ying Wang2013-03-221-1/+1
| | |/ / / / / /
* | | | | | | | Delete icu4j from pathmap.mkYing Wang2013-03-221-1/+0
* | | | | | | | am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update...Scott Main2013-03-214-16/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to...Scott Main2013-03-214-16/+29
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove globa...Scott Main2013-03-214-16/+29
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for...Scott Main2013-03-214-16/+29
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | am 01a2545b: docs: update templates to remove global content for devsite buildsScott Main2013-03-214-16/+29
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | docs: update templates to remove global content for devsite buildsScott Main2013-03-214-16/+29
* | | | | | | | am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 6...Scott Main2013-03-201-15/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety...Scott Main2013-03-201-15/+42
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages...Scott Main2013-03-201-15/+42
| | |\ \ \ \ \ \ | | | |/ / / / /