summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Can not mark the same content of browser page after copy""John Reck2013-04-302-9/+2
|\
| * Revert "Can not mark the same content of browser page after copy"John Reck2013-04-302-9/+2
* | Merge "input: added support for multiple keyevents"Michael Wright2013-04-291-7/+9
|\ \
| * | input: added support for multiple keyeventsDiego Torres Milano2013-04-291-7/+9
|/ /
* | Merge "Document the 'aapt dump strings' command"Christopher Tate2013-04-291-0/+1
|\ \
| * | Document the 'aapt dump strings' commandMÃ¥rten Kongstad2013-04-291-0/+1
* | | Merge "Don't use X509CertImpl directly"Kenny Root2013-04-292-10/+20
|\ \ \ | |/ / |/| |
| * | Don't use X509CertImpl directlyKenny Root2013-04-292-10/+20
|/ /
* | Merge "Use the newer ZoneInfoDB API."Elliott Hughes2013-04-261-1/+1
|\ \
| * | Use the newer ZoneInfoDB API.Elliott Hughes2013-04-261-1/+1
* | | Merge "Can not mark the same content of browser page after copy"Victoria Lease2013-04-262-2/+9
|\ \ \ | |/ / |/| / | |/
| * Can not mark the same content of browser page after copyPeter Nilsson2013-04-102-2/+9
* | Merge "Human-readable POSIX capabilities for SystemServer."Alex Klyubin2013-04-241-1/+29
|\ \
| * | Human-readable POSIX capabilities for SystemServer.Alex Klyubin2013-04-221-1/+29
* | | Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator"Nick Kralevich2013-04-231-1/+5
|\ \ \
| * | | Don't set ADDR_COMPAT_LAYOUT on the emulatorNick Kralevich2013-04-231-1/+5
|/ / /
* | | Merge "Adding matching @deprecated."Ian Rogers2013-04-232-1/+2
|\ \ \
| * | | Adding matching @deprecated.Ian Rogers2013-04-192-1/+2
| |/ /
* | | Merge "KeyEvent: update comment"Michael Wright2013-04-211-2/+2
|\ \ \
| * | | KeyEvent: update commentChirayu Desai2013-04-151-2/+2
* | | | Merge "Correct a small doc error"Christopher Tate2013-04-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Correct a small doc errorScott Kennedy2013-04-191-1/+1
|/ / /
* | | Merge "Fixed the problem ime invisible status despite being the icon that app...Satoshi Kataoka2013-04-182-2/+4
|\ \ \
| * | | Fixed the problem ime invisible status despite being the icon that appears in...jungheang.lee2013-02-282-2/+4
* | | | Merge "AndroidKeyStore: Add encrypted flag"Kenny Root2013-04-159-136/+732
|\ \ \ \
| * | | | AndroidKeyStore: Add encrypted flagKenny Root2013-04-159-136/+732
|/ / / /
* | | | Merge "keystore: Add flag for blobs to be unencrypted"Kenny Root2013-04-152-12/+31
|\ \ \ \
| * | | | keystore: Add flag for blobs to be unencryptedKenny Root2013-04-152-12/+31
|/ / / /
* | | | Merge "Remove keystore entries when app data cleared"Kenny Root2013-04-151-23/+45
|\ \ \ \
| * | | | Remove keystore entries when app data clearedKenny Root2013-04-151-23/+45
|/ / / /
* | | | 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