summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix build."Narayan Kamath2014-06-031-1/+1
|\
| * Fix build.Narayan Kamath2014-06-031-1/+1
|/
* Merge "Scan for renderscript files before deciding ABIs."Narayan Kamath2014-06-034-16/+103
|\
| * Scan for renderscript files before deciding ABIs.Narayan Kamath2014-06-034-16/+103
|/
* Merge "Add an --abi argument to "pm install""Narayan Kamath2014-06-035-90/+167
|\
| * Add an --abi argument to "pm install"Narayan Kamath2014-06-035-90/+167
|/
* Merge "Log process abis during start."Narayan Kamath2014-06-031-0/+4
|\
| * Log process abis during start.Narayan Kamath2014-05-291-0/+4
* | am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."Mike Lockwood2014-06-021-1/+1
|\ \
| * \ Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."Mike Lockwood2014-06-021-1/+1
| |\ \
| | * | MtpDatabase JNI: Fixed incorrect method name in ALOGE.Martin Blumenstingl2014-05-311-1/+1
* | | | am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectProperty...Mike Lockwood2014-06-021-4/+2
|\ \ \ \ | |/ / /
| * | | Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."Mike Lockwood2014-06-021-4/+2
| |\ \ \ | | |/ /
| | * | MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().Martin Blumenstingl2014-05-311-4/+2
| |/ /
* | | am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."Nick Kralevich2014-05-311-59/+60
|\ \ \ | |/ /
| * | Merge "SELinuxMMAC additions to perform policy versioning checks."Nick Kralevich2014-05-311-59/+60
| |\ \
| | * | SELinuxMMAC additions to perform policy versioning checks.Robert Craig2014-04-281-59/+60
* | | | am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy f...Nick Kralevich2014-05-311-5/+19
|\ \ \ \ | |/ / /
| * | | Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."Nick Kralevich2014-05-311-5/+19
| |\ \ \
| | * | | Allow SELinuxPolicyInstallReceiver to update new policy files.Robert Craig2014-04-281-5/+19
| | |/ /
* | | | am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."Elliott Hughes2014-05-312-4/+3
|\ \ \ \ | |/ / /
| * | | Merge "Move frameworks/base off private libcore.ICU API."Elliott Hughes2014-05-312-4/+3
| |\ \ \
| | * | | Move frameworks/base off private libcore.ICU API.Elliott Hughes2014-05-302-4/+3
* | | | | am ce7fa780: Merge "Fix a resource race bug in PathCache"Chris Craik2014-05-302-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix a resource race bug in PathCache"Chris Craik2014-05-302-4/+5
| |\ \ \ \
| | * | | | Fix a resource race bug in PathCacheyuyang2014-05-302-4/+5
| | | |_|/ | | |/| |
* | | | | am bd4d3203: Merge "Support an ABI flag for instrumentation."Narayan Kamath2014-05-305-20/+55
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Support an ABI flag for instrumentation."Narayan Kamath2014-05-305-20/+55
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Support an ABI flag for instrumentation.Narayan Kamath2014-05-165-20/+55
* | | | | am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is us...Wink Saville2014-05-291-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicat...Wink Saville2014-05-291-0/+1
| |\ \ \ \
| | * | | | Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data ...Zhang Wei-e7976c2014-05-291-0/+1
| |/ / / /
* | | | | am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-283-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-283-3/+3
| |\ \ \ \
| | * | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-283-3/+3
| |/ / / /
* | | | | am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-0/+2
| |\ \ \ \
| | * | | | Updated Trace.h to recognize ATRACE_TAG_BIONIC.Brigid Smith2014-05-281-0/+2
| |/ / / /
* | | | | am b75b3aaa: Merge "Build PacProcessor for 64 bit."Narayan Kamath2014-05-282-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Build PacProcessor for 64 bit."Narayan Kamath2014-05-282-3/+0
| |\ \ \ \
| | * | | | Build PacProcessor for 64 bit.Narayan Kamath2014-05-272-3/+0
| |/ / / /
* | | | | am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"Narayan Kamath2014-05-271-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "PacProccesor: Only build for 32-bit"Narayan Kamath2014-05-271-0/+2
| |\ \ \ \
| | * | | | PacProccesor: Only build for 32-bitAndreas Gampe2014-05-271-0/+2
* | | | | | am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"Eric Laurent2014-05-231-133/+147
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AudioService: fix cross deadlock in VolumeStreamState"Eric Laurent2014-05-231-133/+147
| |\ \ \ \ \
| | * | | | | AudioService: fix cross deadlock in VolumeStreamStateEric Laurent2014-05-231-133/+147
| |/ / / / /
* | | | | | am d5ee4144: Merge "Increase start timeout for wrapped process"Dmitriy Ivanov2014-05-231-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Increase start timeout for wrapped process"Dmitriy Ivanov2014-05-231-1/+1
| |\ \ \ \ \
| | * | | | | Increase start timeout for wrapped processDmitriy Ivanov2014-05-221-1/+1
| | | |_|/ / | | |/| | |