summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add the verity key to the verity dependencies."Geremy Condra2014-03-261-1/+2
|\
| * Add the verity key to the verity dependencies.Geremy Condra2014-03-181-1/+2
* | Add wifi-service to PRODUCT_PACKAGES.Tim Kilbourn2014-03-241-1/+2
* | fix bad merge conflict resolutionColin Cross2014-03-211-1/+1
* | resolved conflicts for merge of f8e4d1b7 to masterColin Cross2014-03-212-1/+1
|\ \
| * \ am 37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUMMark Renouf2014-03-212-2/+2
| |\ \
| | * | Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUMMark Renouf2014-03-212-2/+2
* | | | Merge "move libbcc from core_base to core_minimal"Adam Hampson2014-03-212-1/+1
|\ \ \ \
| * | | | move libbcc from core_base to core_minimalAdam Hampson2014-03-212-1/+1
* | | | | Merge "stagefright: use media_codecs_google*.xml files"Lajos Molnar2014-03-218-0/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | stagefright: use media_codecs_google*.xml filesLajos Molnar2014-03-198-0/+24
* | | | | am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redunda...Ying Wang2014-03-203-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"Ying Wang2014-03-203-3/+3
| |\ \ \ \
| | * | | | Remove the redundant DISABLE_DEXPREOPTYing Wang2014-03-203-3/+3
* | | | | | resolved conflicts for merge of ad495272 to masterYing Wang2014-03-202-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"Ying Wang2014-03-202-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix embedded buildYing Wang2014-03-202-1/+1
* | | | | am 77e63659: am cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell serial...Nick Kralevich2014-03-195-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"Nick Kralevich2014-03-195-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Allow shell serial_device read-write access"Nick Kralevich2014-03-195-0/+5
| | |\ \ \
| | | * | | Allow shell serial_device read-write accessNick Kralevich2014-03-185-0/+5
* | | | | | Merge "Add verity build targets for verity-enabled devices."Geremy Condra2014-03-181-0/+28
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add verity build targets for verity-enabled devices.Geremy Condra2014-03-171-0/+28
* | | | | | am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emul...Greg Hackmann2014-03-181-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"Greg Hackmann2014-03-181-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | HACK: disable emulator on x86_64Greg Hackmann2014-03-181-2/+2
| | | |/ / | | |/| |
* | | | | Merge "move audio policy service to a separate library"Eric Laurent2014-03-181-0/+1
|\ \ \ \ \
| * | | | | move audio policy service to a separate libraryEric Laurent2014-03-061-0/+1
* | | | | | am c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress t...Colin Cross2014-03-161-5/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | am 6e92ade0: am db24577b: Merge "Work in progress to enable build system supp...Colin Cross2014-03-151-5/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Work in progress to enable build system support for Clang.Tim Murray2014-03-141-5/+0
* | | | | Remove "screenshot"Andy McFadden2014-03-111-1/+0
| |_|/ / |/| | |
* | | | am 3c14d21a: am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/googl...Victoria Lease2014-03-032-0/+6
|\ \ \ \ | |/ / /
| * | | am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."Victoria Lease2014-03-032-0/+6
| |\ \ \ | | |/ /
| | * | Add external/google-fonts/*/fonts.mk.Victoria Lease2014-02-282-0/+6
* | | | am 3fd8a4fe: am 529a772e: am a90e346c: am cd07521f: Merge "Revert "generic_x8...Ying Wang2014-02-271-1/+0
|\ \ \ \ | |/ / /
| * | | am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""Ying Wang2014-02-271-1/+0
| |\ \ \ | | |/ /
| | * | Merge "Revert "generic_x86: toggle 64bit binder ABI""Ying Wang2014-02-271-1/+0
| | |\ \
| | | * | Revert "generic_x86: toggle 64bit binder ABI"Ying Wang2014-02-271-1/+0
| * | | | am 4c65c202: am 7fc3a06d: Merge "build: add logd"Mark Salyzyn2014-02-271-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "build: add logd"Mark Salyzyn2014-02-271-0/+1
| | |\ \ \
| | | * | | build: add logdNick Kralevich2014-02-261-0/+1
* | | | | | am e9513f95: am 65f26a76: am 9edc9783: Merge "Add policy for MIPS emulator, f...Nick Kralevich2014-02-262-0/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."Nick Kralevich2014-02-262-0/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add policy for MIPS emulator, fix x86 policy.Stephen Smalley2014-02-262-0/+16
| | |/ / /
* | | | | am 61b71bb2: am b8d792d7: am e7154870: Merge "Move qemud and /dev/qemu policy...Nick Kralevich2014-02-2518-1/+52
|\ \ \ \ \ | |/ / / /
| * | | | am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific...Nick Kralevich2014-02-2518-1/+52
| |\ \ \ \ | | |/ / /
| | * | | Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.Stephen Smalley2014-02-2518-1/+52
* | | | | Making ManagedProvisioning present in all phones/tablets.Nicolas Prevot2014-02-251-0/+1
* | | | | am 4a2e083f: am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"Ying Wang2014-02-241-0/+1
|\ \ \ \ \ | |/ / / /