summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Prepare to make Fingerprint API public.Jim Miller2015-04-019-219/+11
* Merge "audio port: support multiple clients"Eric Laurent2015-04-021-12/+42
|\
| * audio port: support multiple clientsEric Laurent2015-04-011-12/+42
* | resolved conflicts for merge of 261e7a37 to masterAlex Klyubin2015-04-012-7/+57
|\ \ | |/ |/|
| * am 39b99186: am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toS...Alex Klyubin2015-04-012-0/+57
| |\
| | * am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."Alex Klyubin2015-04-012-0/+57
| | |\
| | | * Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."Alex Klyubin2015-04-012-0/+57
| | | |\
| | | | * Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.Alex Klyubin2015-04-012-0/+57
* | | | | Merge "Fixing issue related to printing out of display state and idle mode i...Kweku Adams2015-04-022-6/+6
|\ \ \ \ \
| * | | | | Fixing issue related to printing out of display state and idle mode in the b...Kweku Adams2015-04-012-6/+6
* | | | | | Merge "resolved conflicts for merge of 844e44c9 to master"Andreas Gampe2015-04-011-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | resolved conflicts for merge of 844e44c9 to masterAndreas Gampe2015-04-011-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 7598a248: am e816f917: Merge "Frameworks/base: Use system property for cac...Andreas Gampe2015-04-011-0/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | am e816f917: Merge "Frameworks/base: Use system property for cache prune coun...Andreas Gampe2015-04-011-0/+5
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "Frameworks/base: Use system property for cache prune counter"Andreas Gampe2015-04-011-0/+5
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Frameworks/base: Use system property for cache prune counterAndreas Gampe2015-04-011-0/+5
* | | | | | Merge "New generic intent for SIM Activation"Santos Cordon2015-04-013-0/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | New generic intent for SIM ActivationSantos Cordon2015-04-013-0/+31
* | | | | | Merge "Add breakStrategy attribute to TextView"Raph Levien2015-04-017-81/+179
|\ \ \ \ \ \
| * | | | | | Add breakStrategy attribute to TextViewRaph Levien2015-04-017-81/+179
* | | | | | | Merge "Fix docs"Alan Viverette2015-04-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix docsAlan Viverette2015-04-011-1/+1
* | | | | | | | am bcfa7cb2: am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi...Olawale Ogunwale2015-04-011-33/+69
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread acces...Olawale Ogunwale2015-04-011-33/+69
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same pr...Olawale Ogunwale2015-04-011-33/+69
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | [ActivityManager] Improve multi-thread access the same providerriddle_hsu2015-04-011-33/+69
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-011-1/+1
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-0173-89/+726
* | | | | | | Merge "Revert "Add lockTaskOnLaunch attribute.""Craig Mautner2015-04-014-30/+8
|\ \ \ \ \ \ \
| * | | | | | | Revert "Add lockTaskOnLaunch attribute."Craig Mautner2015-04-014-30/+8
* | | | | | | | Merge "Revert "Fix build.""Craig Mautner2015-04-011-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Revert "Fix build."Craig Mautner2015-04-011-2/+8
* | | | | | | | Merge "Fix build."Craig Mautner2015-04-011-8/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix build.Craig Mautner2015-03-311-8/+2
* | | | | | | | am 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUP...Alex Klyubin2015-04-011-3/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LE...Alex Klyubin2015-04-011-3/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"Alex Klyubin2015-04-011-3/+4
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTHAlex Klyubin2015-03-311-3/+4
| | | | |_|_|/ | | | |/| | |
* | | | | | | Merge "Add lockTaskOnLaunch attribute."Craig Mautner2015-04-014-8/+30
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Add lockTaskOnLaunch attribute.Craig Mautner2015-03-314-8/+30
* | | | | | | Merge "Do not hide any call log entries when they are added."Santos Cordon2015-04-011-8/+0
|\ \ \ \ \ \ \
| * | | | | | | Do not hide any call log entries when they are added.Santos Cordon2015-03-311-8/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Support for nested bundles in setApplicationRestrictions"Fyodor Kupolov2015-03-317-72/+376
|\ \ \ \ \ \ \
| * | | | | | | Support for nested bundles in setApplicationRestrictionsFyodor Kupolov2015-03-307-72/+376
* | | | | | | | Merge "Add CameraService to system server."Ruben Brunk2015-03-313-0/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add CameraService to system server.Ruben Brunk2015-03-313-0/+17
* | | | | | | | Merge "Move reset network settings into framework."Stuart Scott2015-03-312-0/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Move reset network settings into framework.Stuart Scott2015-03-302-0/+60
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "[Auth:Last Credentials Timing] : Introducing API"Simranjit Singh Kohli2015-03-312-6/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | [Auth:Last Credentials Timing] : Introducing APISimranjit Singh Kohli2015-03-302-6/+45
generated by cgit v1.1 at 2024-09-16 17:36:53 +0000