summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve doc for EditorInfo#initialSel{Start,End}Jean Chalard2014-02-213-62/+94
* Merge "Unbreak manual brightness setting."Michael Wright2014-02-211-1/+1
|\
| * Unbreak manual brightness setting.Michael Wright2014-02-201-1/+1
* | Merge "resolved conflicts for merge of baaa080b to master"Jeff Brown2014-02-2132-277/+1376
|\ \
| * \ resolved conflicts for merge of baaa080b to masterJeff Brown2014-02-2032-277/+1376
| |\ \
| | * \ am 90506a41: am 07e6d1b9: Merge "Add a new "doze mode" based on Dream compone...Jeff Brown2014-02-2031-287/+1377
| | |\ \
| | | * \ am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into kl...Jeff Brown2014-02-2031-287/+1377
| | | |\ \
| | | | * \ Merge "Add a new "doze mode" based on Dream components." into klp-modular-devJeff Brown2014-02-2031-287/+1377
| | | | |\ \
| | | | | * | Add a new "doze mode" based on Dream components.Jeff Brown2014-02-2031-287/+1377
* | | | | | | Merge "Add ability to match intents based on the package name of the intent s...Ben Gruver2014-02-212-0/+74
|\ \ \ \ \ \ \
| * | | | | | | Add ability to match intents based on the package name of the intent senderBen Gruver2014-02-122-0/+74
* | | | | | | | Merge "Add more MediaStore constants for playback intents"Matt Casey2014-02-213-0/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add more MediaStore constants for playback intentsMatt Casey2014-02-203-0/+37
* | | | | | | | Merge "Abort removing account if prohibited by policy"Amith Yamasani2014-02-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Abort removing account if prohibited by policyAmith Yamasani2014-02-201-0/+1
* | | | | | | | | am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292c...Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 81026...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009...Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "I...Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-208-15/+15
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-198-15/+15
* | | | | | | | | | | | | am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443...Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca43...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803...Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "I...Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-4/+4
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-4/+4
| | | | | | | |/ / / / / /
* | | | | | | | | | | | | am 46f1744a: (-s ours) am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f534...Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b4...Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "I...Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-2013-47/+47
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-1913-47/+47
| | | | | | | |/ / / / / /
* | | | | | | | | | | | | am e16fe1aa: (-s ours) am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96...Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b...Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "I...Baligh Uddin2014-02-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-02-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-02-201-2/+2
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-2/+2
| | | | | | | |/ / / / / /
* | | | | | | | | | | | | am e9a5424c: (-s ours) am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297...Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 80271...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9ada...Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /