summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | am 979d578e: Merge "Fix host java doc by referring to the correct classpath."Ying Wang2014-07-081-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge "Fix host java doc by referring to the correct classpath."Ying Wang2014-07-021-3/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fix host java doc by referring to the correct classpath.Ying Wang2014-07-071-3/+6
| | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUI...Ying Wang2014-07-082-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."Ying Wang2014-07-082-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."Ying Wang2014-07-082-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."Ying Wang2014-07-022-3/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Clean the last bit of LOCAL_BUILD_HOST_DEX.Ying Wang2014-07-072-3/+2
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Auto-clean obsolete aidl-generated Java files.Ying Wang2014-07-072-1/+33
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am e68ec719: (-s ours) [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-...Ying Wang2014-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.Ying Wang2014-07-023-12/+6
* | | | | | | | | | | | | | | | am 3be473bd: am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not j...Brian Carlstrom2014-07-021-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"Brian Carlstrom2014-07-021-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"Brian Carlstrom2014-07-021-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "Strip all multidex files, not just classes.dex"Brian Carlstrom2014-07-011-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Strip all multidex files, not just classes.dexBrian Carlstrom2014-07-011-1/+5
* | | | | | | | | | | | | | | | | am 51f01f64: am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in inst...Ying Wang2014-07-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"Ying Wang2014-07-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"Ying Wang2014-07-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Fix partition_tag usage in install_jni_libs"Ying Wang2014-07-021-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fix partition_tag usage in install_jni_libsDan Willemsen2014-07-011-2/+2
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Add ims-common to PRODUCT_PACKAGESNick Vaccaro2014-07-021-0/+1
* | | | | | | | | | | | | | | | Merge "Add phone directory to frameworks/base."Santos Cordon2014-07-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add phone directory to frameworks/base.Santos Cordon2014-07-021-0/+1
* | | | | | | | | | | | | | | | | Merge "Fixes for core_tiny zygote to boot"Brian Carlstrom2014-07-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixes for core_tiny zygote to bootBrian Carlstrom2014-07-011-0/+6
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Use "$@" to preserve argument word breaksYing Wang2014-07-011-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Fix typo.Ying Wang2014-06-301-1/+1
* | | | | | | | | | | | | | | | am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library pa...Ying Wang2014-07-011-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 2530c787: am 4b539d15: Merge "More consistent host library path in multili...Ying Wang2014-07-011-6/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 4b539d15: Merge "More consistent host library path in multilib build."Ying Wang2014-07-011-6/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "More consistent host library path in multilib build."Ying Wang2014-06-301-6/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | More consistent host library path in multilib build.Ying Wang2014-06-301-6/+4
* | | | | | | | | | | | | | | | | am 3a2f6ecf: am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86...Elliott Hughes2014-06-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."Elliott Hughes2014-06-301-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."Elliott Hughes2014-06-301-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Add -Wl,--fatal-warnings to x86_64."Elliott Hughes2014-06-261-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Add -Wl,--fatal-warnings to x86_64.Elliott Hughes2014-06-301-0/+1
* | | | | | | | | | | | | | | | | am 9327f77a: am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jn...Ying Wang2014-06-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."Ying Wang2014-06-301-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."Ying Wang2014-06-301-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Fix missing rs_compatibility_jni_libs."Ying Wang2014-06-271-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Fix missing rs_compatibility_jni_libs.Ying Wang2014-06-301-0/+2
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Fix missing rs_compatibility_jni_libs.Ying Wang2014-06-301-0/+2
* | | | | | | | | | | | | | | | | am 556efe00: am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /build...Ying Wang2014-06-301-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automerge...Ying Wang2014-06-301-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aos...Ying Wang2014-06-301-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."Ying Wang2014-06-271-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Remove nonexistent $ANDROID_QTOOLS from $PATH.Ying Wang2014-06-301-2/+1
| | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | resolved conflicts for merge of da92aef7 to masterBrian Carlstrom2014-06-281-18/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /