summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceN...Michael Wright2014-12-301-0/+1
|\
| * am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." in...Michael Wright2014-12-301-0/+1
| |\
| | * Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-devMichael Wright2014-12-301-0/+1
| | |\
| | | * Add MEDIA_PROJECTION_SERVICE to the ServiceName list.Michael Wright2014-12-231-0/+1
* | | | am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.Svetoslav2014-12-291-17/+15
|\ \ \ \ | |/ / /
| * | | am e5ea48a7: Fix a race in accessibility manager.Svetoslav2014-12-291-17/+15
| |\ \ \ | | |/ /
| | * | Fix a race in accessibility manager.Svetoslav2014-12-291-17/+15
* | | | am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces...Narayan Kamath2014-12-291-1/+1
|\ \ \ \
| * \ \ \ Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."Narayan Kamath2014-12-291-1/+1
| |\ \ \ \
| | * | | | Fixed grammar in the comment that introduces the Debug.MemoryInfo class.justinmuller2013-10-161-1/+1
* | | | | | am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to ...Narayan Kamath2014-12-291-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""Narayan Kamath2014-12-291-4/+4
| |\ \ \ \ \
| | * | | | | Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"jangwon.lee2014-02-061-4/+4
* | | | | | | am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred net...Elliott Hughes2014-12-261-8/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "telephony: Update comments for preferred network mode"Elliott Hughes2014-12-261-8/+1
| |\ \ \ \ \ \
| | * | | | | | telephony: Update comments for preferred network modeSungmin Choi2014-12-251-8/+1
* | | | | | | | am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining clic...Svet Ganov2014-12-191-2/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am e130d6c1: Merge "Remove a bad heuristic when determining click location fo...Svet Ganov2014-12-191-2/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Remove a bad heuristic when determining click location for accessibility.Svet Ganov2014-12-191-2/+1
* | | | | | | | am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition anim...Winson Chung2014-12-181-6/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a320b217: Merge "Bug 18784289: Fix issue with transition animation callbac...Winson Chung2014-12-181-6/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-...Winson Chung2014-12-181-6/+10
| | |\ \ \ \ \ \
| | | * | | | | | Bug 18784289: Fix issue with transition animation callback.Winson Chung2014-12-181-6/+10
* | | | | | | | | am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."Elliott Hughes2014-12-182-60/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "Move the remaining ZygoteInit native code over to Java."Elliott Hughes2014-12-182-60/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move the remaining ZygoteInit native code over to Java.Elliott Hughes2014-12-172-60/+14
* | | | | | | | | | am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bu...Winson Chung2014-12-181-11/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" ...Winson Chung2014-12-181-11/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-devWinson Chung2014-12-181-11/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Removing context ref from AppWidgetHost. (Bug 18769791)Winson Chung2014-12-171-11/+11
| | | | |_|/ / / / / | | | |/| | | | | |
* | | | | | | | | | am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" i...Raph Levien2014-12-171-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-devRaph Levien2014-12-171-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-devRaph Levien2014-12-171-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Revert "Change Linkify leniency to VALID"Raph Levien2014-12-171-2/+2
* | | | | | | | | | | am 486a9942: Merge "[ActivityManager] Use synchronized to protect object"Olawale Ogunwale2014-12-171-11/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "[ActivityManager] Use synchronized to protect object"Olawale Ogunwale2014-12-171-11/+13
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | [ActivityManager] Use synchronized to protect objectmark_chen2014-12-161-11/+13
* | | | | | | | | | | am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into l...Jeff Davidson2014-12-171-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Add global setting for ephemeral network timeout." into lmp-mr1-devJeff Davidson2014-12-171-0/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Add global setting for ephemeral network timeout." into lmp-mr1-devJeff Davidson2014-12-171-0/+12
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add global setting for ephemeral network timeout.Jeff Davidson2014-12-161-0/+12
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
* | | | | | | | | | | am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."Elliott Hughes2014-12-171-31/+26
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Rewrite selectReadable JNI in Java."Elliott Hughes2014-12-171-31/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Rewrite selectReadable JNI in Java.Elliott Hughes2014-12-161-31/+26
* | | | | | | | | | | | am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1...Jorim Jaggi2014-12-171-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-devJorim Jaggi2014-12-171-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Fix colored icons in doze mode" into lmp-mr1-devJorim Jaggi2014-12-171-2/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix colored icons in doze modeJorim Jaggi2014-12-171-2/+8
* | | | | | | | | | | | | am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1...Nicolas Prevot2014-12-171-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1...Nicolas Prevot2014-12-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /