summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
|\
| * Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
* | Merge "Fix javadoc error in Debug.getRuntimeStats()."Hiroshi Yamauchi2015-04-141-1/+1
|\ \
| * | Fix javadoc error in Debug.getRuntimeStats().Hiroshi Yamauchi2015-04-141-1/+1
* | | Merge "Fix UB in ResourceTable::stringToInt."Dan Albert2015-04-144-35/+155
|\ \ \ | |/ / |/| |
| * | Fix UB in ResourceTable::stringToInt.Dan Albert2015-04-084-35/+155
* | | Merge "No need to specify EC curve name in EcIesParameterSpec."Alex Klyubin2015-04-141-25/+2
|\ \ \
| * | | No need to specify EC curve name in EcIesParameterSpec.Alex Klyubin2015-04-131-25/+2
* | | | Merge "Make specifying self-signed cert parameters optional."Alex Klyubin2015-04-142-40/+64
|\ \ \ \
| * | | | Make specifying self-signed cert parameters optional.Alex Klyubin2015-04-142-40/+64
* | | | | Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-141-0/+90
|/ / / /
* | | | Merge "Add name to ScriptGroup2.Builder.create() method"Yang Ni2015-04-143-9/+15
|\ \ \ \
| * | | | Add name to ScriptGroup2.Builder.create() methodYang Ni2015-04-133-9/+15
* | | | | Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-146-7/+51
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add android.net.IpPrefix#contains()Erik Kline2015-04-146-7/+51
* | | | | Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBou...Ruchi Kandoi2015-04-141-1/+1
|\ \ \ \ \
| * | | | | BatteryStats: Adds an additional condition to avoidRuchi Kandoi2014-07-081-1/+1
* | | | | | Merge "Add a name to ScriptGroup2.Builder.create method"Yang Ni2015-04-131-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add a name to ScriptGroup2.Builder.create methodYang Ni2015-04-131-1/+5
|/ / / / /
* | | | | Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-1317-1446/+1151
|\ \ \ \ \
| * | | | | Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-1317-1446/+1151
* | | | | | Merge "Clean-up state if we have an exception when acquiring provider"Wale Ogunwale2015-04-131-24/+42
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Clean-up state if we have an exception when acquiring providerWale Ogunwale2015-04-101-24/+42
* | | | | | Merge "Add EcIesParameterSpec to enable ECIES crypto."Alex Klyubin2015-04-111-0/+287
|\ \ \ \ \ \
| * | | | | | Add EcIesParameterSpec to enable ECIES crypto.Alex Klyubin2015-04-101-0/+287
* | | | | | | Merge "Fix testSaw_ungrantedUid_Bluetooth"Chad Brubaker2015-04-101-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix testSaw_ungrantedUid_BluetoothChad Brubaker2015-04-101-2/+2
* | | | | | | | Merge "Make several key crypto parameters repeatable"Shawn Willden2015-04-101-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Make several key crypto parameters repeatableChad Brubaker2015-04-101-6/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "Check caller status precisely when registering receiver."Olawale Ogunwale2015-04-101-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Check caller status precisely when registering receiver.riddle_hsu2015-04-101-2/+3
* | | | | | | | Merge "Track more changes to keymaster_defs.h"Alex Klyubin2015-04-102-27/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Track more changes to keymaster_defs.hAlex Klyubin2015-04-102-27/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Impose an ordering on created SELinuxMMAC Policy objects."Nick Kralevich2015-04-101-53/+164
|\ \ \ \ \ \ \
| * | | | | | | Impose an ordering on created SELinuxMMAC Policy objects.Robert Craig2015-04-101-53/+164
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."John Reck2015-04-101-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix GL_INVALID_OPERATION in font renderer when font cache is limited.chaochen2014-08-291-0/+2
* | | | | | | | Merge "Fixing memory leak in RenderBufferCache"John Reck2015-04-101-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing memory leak in RenderBufferCacheSamsung2014-09-241-0/+5
* | | | | | | | | Merge "Add support for setting the cache directory."Tim Murray2015-04-102-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add support for setting the cache directory.Tim Murray2015-04-092-0/+26
|/ / / / / / / /
* | | | | | | | Merge "Track recent keymaster_defs.h changes."Alex Klyubin2015-04-102-21/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Track recent keymaster_defs.h changes.Alex Klyubin2015-04-092-21/+3
|/ / / / / / / /
* | | | | | | | Merge "Split key origin into TEE/not and generated/imported."Alex Klyubin2015-04-093-15/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Split key origin into TEE/not and generated/imported.Alex Klyubin2015-04-093-15/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""Mathieu Chartier2015-04-091-2/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"Mathieu Chartier2015-04-091-2/+21
|/ / / / / / /
* | | | | | | Merge "Start passing volume UUID to installd."Jeff Sharkey2015-04-091-2/+101
|\ \ \ \ \ \ \
| * | | | | | | Start passing volume UUID to installd.Jeff Sharkey2015-04-091-2/+101
| | |_|_|_|_|/ | |/| | | | |