summaryrefslogtreecommitdiffstats
path: root/target/product
Commit message (Expand)AuthorAgeFilesLines
* am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-192-2/+2
|\
| * am dab766a7: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-192-2/+2
| |\
| | * Switch from core to core-libartBrian Carlstrom2014-06-182-2/+2
* | | am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST...Brian Carlstrom2014-06-183-29/+0
|\ \ \ | |/ /
| * | am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."Brian Carlstrom2014-06-183-29/+0
| |\ \ | | |/
| | * Remove some uses of the deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-183-29/+0
| * | Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into s...Steve Moyer2014-06-171-2/+2
| |\ \
| | * | DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer2014-06-161-2/+2
* | | | am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-172-8/+4
|\ \ \ \ | |/ / /
| * | | am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-172-8/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * Make default 64-bit primary, 32-bit secondaryBrian Carlstrom2014-06-162-8/+4
* | | am e20af003: Merge "Add drm framework library to core_tiny" into klp-modular-devAdam Lesinski2014-06-131-0/+2
|\ \ \
| * | | Add drm framework library to core_tinyAdam Lesinski2014-06-061-0/+2
* | | | am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk."Nick Kralevich2014-06-121-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | am c80e876c: Merge "Add service_contexts to embedded.mk."Nick Kralevich2014-06-121-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | Add service_contexts to embedded.mk.Riley Spahn2014-06-121-1/+2
* | | | am c7504124: am 47cdacd5: Merge "Remove libportable from core_base.mk."Elliott Hughes2014-06-101-1/+0
|\ \ \ \ | |/ / /
| * | | am 47cdacd5: Merge "Remove libportable from core_base.mk."Elliott Hughes2014-06-101-1/+0
| |\ \ \ | | |/ /
| | * | Remove libportable from core_base.mk.Elliott Hughes2014-06-101-1/+0
| | * | Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""Qiwen Zhao2014-06-041-2/+2
| | * | Revert "DO NOT MERGE: Combine emulator test projects into a single apk"Qiwen Zhao2014-06-041-2/+2
| | * | DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer2014-06-041-0/+1
| | * | DO NOT MERGE: Combine emulator test projects into a single apkSteve Moyer2014-06-041-2/+2
| |/ /
* | | am 3f1b5c52: Merge "The public Telephony APIs must be present in all Android ...Adam Lesinski2014-06-051-1/+7
|\ \ \ | | |/ | |/|
| * | The public Telephony APIs must be present in all Android productsAdam Lesinski2014-06-031-1/+7
* | | am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."Nick Kralevich2014-06-021-1/+2
|\ \ \ | | |/ | |/|
| * | am c706ea79: Merge "Include selinux_version file with builds."Nick Kralevich2014-06-021-1/+2
| |\ \
| | * \ Merge "Include selinux_version file with builds."Nick Kralevich2014-06-021-1/+2
| | |\ \
| | | * | Include selinux_version file with builds.Robert Craig2014-04-281-1/+2
* | | | | am f4115cdf: am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"Dave Allison2014-05-291-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"Dave Allison2014-05-291-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add libsigchain to the embedded.mk makefile"Dave Allison2014-05-291-1/+2
| | |\ \ \
| | | * | | Add libsigchain to the embedded.mk makefileDave Allison2014-05-161-1/+2
* | | | | | resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aospBrian Carlstrom2014-05-291-2/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ge...Brian Carlstrom2014-05-291-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-1/+0
* | | | | | am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-271-0/+4
| | |\ \ \ \
| | | * | | | Switch x86_64 emulator to 64 bit primary.Narayan Kamath2014-05-271-0/+4
* | | | | | | resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aospNarayan Kamath2014-05-271-6/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."Narayan Kamath2014-05-271-6/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."Narayan Kamath2014-05-271-6/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Remove hardcoded TARGET_PREFER_32_BIT_APPS.Narayan Kamath2014-05-271-6/+0
* | | | | | | am 1fe58202: am ea65c191: Merge "libctest: zap"Mark Salyzyn2014-05-211-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ea65c191: Merge "libctest: zap"Mark Salyzyn2014-05-211-1/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | libctest: zapMark Salyzyn2014-05-211-1/+0
* | | | | | | am feb371ad: am 90a0edbc: Merge "Remove netd_client. It has moved to the inte...Sreeram Ramachandran2014-05-211-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."Sreeram Ramachandran2014-05-211-1/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Remove netd_client. It has moved to the internal tree.Sreeram Ramachandran2014-05-211-1/+0
| | |/ / / /