summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Check outInfo is not null"Kenny Root2013-04-151-8/+10
|\
| * Check outInfo is not nullKenny Root2013-04-151-8/+10
|/
* Merge "Remove /data/system location for mac_permissions.xml."Geremy Condra2013-04-121-1/+0
|\
| * Remove /data/system location for mac_permissions.xml.Stephen Smalley2013-04-051-1/+0
* | Merge "Add /data/security path for mac_permissions.xml."Geremy Condra2013-04-051-0/+1
|\ \ | |/
| * Add /data/security path for mac_permissions.xml.Stephen Smalley2013-04-051-0/+1
|/
* Merge "Add new physical keyboard layouts."Jeff Brown2013-04-054-0/+732
|\
| * Add new physical keyboard layouts.Olivier Gay2013-03-304-0/+732
* | Merge "Update list of all audio files."Jean-Baptiste Queru2013-04-032-11/+278
|\ \
| * | Update list of all audio files.Jean-Baptiste Queru2013-04-032-11/+278
* | | Merge "Adjust the HttpResponseCache for OkHttp."Brian Carlstrom2013-04-032-8/+10
|\ \ \
| * | | Adjust the HttpResponseCache for OkHttp.jwilson2013-04-032-8/+10
|/ / /
* | | Merge "Remove keystore entries when package removed"Kenny Root2013-04-033-0/+43
|\ \ \ | |/ / |/| |
| * | Remove keystore entries when package removedKenny Root2013-04-023-0/+43
* | | Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"Andreas Huber2013-04-031-1/+1
|\ \ \
| * | | MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATMMartin Storsjo2013-02-261-1/+1
* | | | Merge "Fix potential deadlock between LockScreen and WindowManagerService"Craig Mautner2013-04-021-3/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix potential deadlock between LockScreen and WindowManagerServiceSangkyu Lee2013-04-021-3/+25
|/ / /
* | | Merge "It helps to catch the right exception."Jean-Baptiste Queru2013-04-011-1/+1
|\ \ \ | |_|/ |/| |
| * | It helps to catch the right exception.Jeff Sharkey2013-03-261-1/+1
* | | Merge "Clarify the documentation of SparseArray.indexOfValue."Elliott Hughes2013-03-291-8/+10
|\ \ \
| * | | Clarify the documentation of SparseArray.indexOfValue.Elliott Hughes2013-03-261-8/+10
* | | | Merge "KeyStore: add API to query storage type"Kenny Root2013-03-292-0/+29
|\ \ \ \
| * | | | KeyStore: add API to query storage typeKenny Root2013-03-292-0/+29
|/ / / /
* | | | Merge "AndroidKeyStore: add Builder for param spec"Kenny Root2013-03-282-4/+160
|\ \ \ \
| * | | | AndroidKeyStore: add Builder for param specKenny Root2013-03-282-4/+160
* | | | | Merge "Save off the seinfo value with packages.list."Geremy Condra2013-03-282-3/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Save off the seinfo value with packages.list.Robert Craig2013-03-262-3/+6
| | |/ / | |/| |
* | | | Merge "Add ability to install credentials as other UID"Kenny Root2013-03-281-0/+8
|\ \ \ \
| * | | | Add ability to install credentials as other UIDKenny Root2013-03-281-0/+8
* | | | | Merge "Correct executable bit for source files [Take 2]"Elliott Hughes2013-03-2856-0/+0
|\ \ \ \ \
| * | | | | Correct executable bit for source files [Take 2]Chirayu Desai2013-03-2756-0/+0
* | | | | | Merge "Add data validation on seinfo labels."Geremy Condra2013-03-281-2/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add data validation on seinfo labels.Robert Craig2013-03-281-2/+24
|/ / / / /
* | | | | Merge "Add interrupter library to simulate EINTR"Kenny Root2013-03-283-0/+153
|\ \ \ \ \
| * | | | | Add interrupter library to simulate EINTRKenny Root2012-10-153-0/+153
* | | | | | Merge "Two REMOVE_PROVIDER messages caused by race condition."Dianne Hackborn2013-03-271-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Two REMOVE_PROVIDER messages caused by race condition.Guobin Zhang2013-03-271-0/+7
|/ / / / /
* | | | | Merge "Remove dead DateUtils code that was never in an API level."Elliott Hughes2013-03-262-116/+17
|\ \ \ \ \
| * | | | | Remove dead DateUtils code that was never in an API level.Elliott Hughes2013-03-262-116/+17
|/ / / / /
* | | | | Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."Elliott Hughes2013-03-261-85/+43
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.Elliott Hughes2013-03-261-85/+43
|/ / / /
* | | | Merge "BackupManagerService files need new security labeling."Geremy Condra2013-03-262-0/+17
|\ \ \ \
| * | | | BackupManagerService files need new security labeling.rpcraig2012-12-042-0/+17
* | | | | Merge "Proper security labeling of multi-user data directories."Geremy Condra2013-03-256-9/+13
|\ \ \ \ \
| * | | | | Proper security labeling of multi-user data directories.rpcraig2013-03-256-9/+13
* | | | | | Merge "Add seinfo parsing to PackageManagerService."Geremy Condra2013-03-258-11/+311
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add seinfo parsing to PackageManagerService.Robert Craig2013-03-258-11/+311
|/ / / / /
* | | | | Merge "KeyStore: change migrate to duplicate"Kenny Root2013-03-213-14/+42
|\ \ \ \ \
| * | | | | KeyStore: change migrate to duplicateKenny Root2013-03-213-14/+42
|/ / / / /