summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Expand)AuthorAgeFilesLines
* 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 ad319779: am 4afe808c: Merge "Fix all the system image sizes."Elliott Hughes2014-05-283-3/+3
|\ \ \ | |/ /
| * | am 4afe808c: Merge "Fix all the system image sizes."Elliott Hughes2014-05-283-3/+3
| |\ \ | | |/
| | * Fix all the system image sizes.Elliott Hughes2014-05-273-3/+3
* | | am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-272-2/+5
|\ \ \ | |/ /
| * | am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-272-2/+5
| |\ \ | | |/
| | * Merge "Switch x86_64 emulator to 64 bit primary."Narayan Kamath2014-05-272-2/+5
| | |\
| | | * Switch x86_64 emulator to 64 bit primary.Narayan Kamath2014-05-272-2/+5
* | | | 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
| | |/
* | | am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full."Elliott Hughes2014-05-201-1/+1
|\ \ \ | |/ /
| * | am 0dbcff95: Merge "The generic_arm64 system image is full."Elliott Hughes2014-05-201-1/+1
| |\ \ | | |/
| | * The generic_arm64 system image is full.Elliott Hughes2014-05-201-1/+1
* | | am 0861ed07: Merge "Have core_tiny depend on the NullWebView." into klp-modul...Ben Murdoch2014-05-201-1/+3
|\ \ \
| * \ \ Merge "Have core_tiny depend on the NullWebView." into klp-modular-devBen Murdoch2014-05-201-1/+3
| |\ \ \
| | * | | Have core_tiny depend on the NullWebView.Ben Murdoch2014-05-191-1/+3
* | | | | am cf8cd38f: Merge "All devices that depend on WebView must have the system f...Ben Murdoch2014-05-201-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "All devices that depend on WebView must have the system feature." into...Ben Murdoch2014-05-201-0/+3
| |\ \ \ \ | | |/ / /
| | * | | All devices that depend on WebView must have the system feature.Ben Murdoch2014-04-041-0/+3
* | | | | am a8355eca: am 64f3a191: Merge "Multilib support for odex"Brian Carlstrom2014-05-191-3/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 64f3a191: Merge "Multilib support for odex"Brian Carlstrom2014-05-191-3/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Multilib support for odex"Brian Carlstrom2014-05-191-3/+0
| | |\ \ \
| | | * | | Multilib support for odexYing Wang2014-05-181-3/+0
* | | | | | am c0f0e8ca: am 13b48588: Merge "Allow qemu_device read-write access to vario...Ji-Hwan Lee2014-05-1910-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 13b48588: Merge "Allow qemu_device read-write access to various processes"Ji-Hwan Lee2014-05-1910-1/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Allow qemu_device read-write access to various processesJi-Hwan Lee2014-05-1910-1/+14
* | | | | | am acfb2723: am c60783c9: Merge "Increase system image size to 650M for gener...Ji-Hwan Lee2014-05-181-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c60783c9: Merge "Increase system image size to 650M for generic_arm64"Ji-Hwan Lee2014-05-181-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Increase system image size to 650M for generic_arm64Ji-Hwan Lee2014-05-181-1/+1
| | |/ / /
* | | | | am 3446af69: Add CalendarProvider to core_tinyJustin Koh2014-05-161-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add CalendarProvider to core_tinyJustin Koh2014-05-161-0/+1
* | | | | am 658d89e9: am 4ec7007f: Merge "Increase system image size to 650M for gener...Ji-Hwan Lee2014-05-161-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 4ec7007f: Merge "Increase system image size to 650M for generic_x86"Ji-Hwan Lee2014-05-161-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Increase system image size to 650M for generic_x86Ji-Hwan Lee2014-05-161-1/+1
* | | | | am 6af650d6: am da492d7e: Merge "Introduce netd_client, a dynamic library tha...Sreeram Ramachandran2014-05-141-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to ne...Sreeram Ramachandran2014-05-141-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Introduce netd_client, a dynamic library that talks to netd.Sreeram Ramachandran2014-05-141-0/+1
* | | | | am abe42666: Move libkeystore to minimalKenny Root2014-05-143-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Move libkeystore to minimalKenny Root2014-05-143-1/+2
* | | | | am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib sup...Ying Wang2014-05-131-0/+3
|\ \ \ \ \ | | |/ / / | |/| | |