summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of b60ccd66 to masterNarayan Kamath2014-06-172-8/+4
|\
| * 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
| | |\
| | | * 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 cac1fc6d: am 5bb6eeb9: am d9c312b5: Merge "Allow all domains access to /de...dcashman2014-06-1721-30/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 5bb6eeb9: am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-30/+4
| |\ \ \ \ | | |/ / /
| | * | | am d9c312b5: Merge "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-30/+4
| | |\ \ \ | | | |/ /
| | | * | Allow all domains access to /dev/qemu_trace.dcashman2014-06-1621-30/+4
| * | | | am 8dea5006: am 357842b1: Merge "Revert "Allow all domains access to /dev/qem...dcashman2014-06-1621-4/+28
| |\ \ \ \ | | |/ / /
| | * | | am 357842b1: Merge "Revert "Allow all domains access to /dev/qemu_trace.""dcashman2014-06-1621-4/+28
| | |\ \ \ | | | |/ /
| | | * | Revert "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-4/+28
* | | | | Revert "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-4/+28
* | | | | am 3aeceecd: am cd978db2: am 96df14d6: Merge "Allow all domains access to /de...dcashman2014-06-1621-28/+4
|\ \ \ \ \ | |/ / / /
| * | | | am cd978db2: am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-28/+4
| |\ \ \ \ | | |/ / /
| | * | | am 96df14d6: Merge "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-28/+4
| | |\ \ \ | | | |/ /
| | | * | Allow all domains access to /dev/qemu_trace.dcashman2014-06-1621-28/+4
| | | |/
* | | | am b9c024c6: am e20af003: Merge "Add drm framework library to core_tiny" into...Adam Lesinski2014-06-131-0/+2
|\ \ \ \ | |/ / /
| * | | 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
* | | | | Merge "Merge kwd to master"Wink Saville2014-06-131-0/+2
|\ \ \ \ \
| * | | | | Merge kwd to masterWink Saville2014-06-111-0/+2
* | | | | | am 64dd84a9: am 003f84fb: am c80e876c: Merge "Add service_contexts to embedde...Nick Kralevich2014-06-121-1/+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 b3529761: am 2d4a27ee: am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VAR...Ying Wang2014-06-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 2d4a27ee: am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm6...Ying Wang2014-06-111-1/+1
| |\ \ \ \ | | |/ / /
| | * | | am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"Ying Wang2014-06-111-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"Ying Wang2014-06-101-1/+1
| | | |\ \
| | | | * | AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15Serban Constantinescu2014-06-041-1/+1
* | | | | | am b5153477: am c7504124: am 47cdacd5: Merge "Remove libportable from core_ba...Elliott Hughes2014-06-111-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 93d45370: core_base.mk: add hevc software decoderLajos Molnar2014-06-061-0/+1
|\ \ \ \
| * | | | core_base.mk: add hevc software decoderLajos Molnar2014-06-051-0/+1
| * | | | Add libsigchain to the embedded.mk makefileDave Allison2014-06-021-1/+2
* | | | | Merge commit '2f9a705e' into manualmergeAdam Lesinski2014-06-051-1/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | Merge "add sound trigger service library"Eric Laurent2014-06-051-0/+2
|\ \ \ \ \
| * | | | | add sound trigger service libraryEric Laurent2014-06-041-0/+2
* | | | | | am 362d2d41: am 333005f1: am c706ea79: Merge "Include selinux_version file wi...Nick Kralevich2014-06-021-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 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
| | |\ \ \