summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-101-22/+0
|\
| * am 09265698: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| |\ | |/ |/|
* | Import translations. DO NOT MERGEstable/cm-13.0-ZNH0EGeoff Mendal2015-05-301-0/+22
|/
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+66
* am afb167eb: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao2015-03-230-0/+0
|\
| * reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\
| | * am 59aefd0a: (-s ours) am bb176610: (-s ours) am 0158c378: (-s ours) Import t...Baligh Uddin2015-03-200-0/+0
| | |\
| | * \ am 2e800c01: (-s ours) am 70f7b1b6: (-s ours) am cb9247ce: (-s ours) Merge "I...Baligh Uddin2015-03-200-0/+0
| | |\ \
| | * \ \ am f3a2bb19: (-s ours) am f8e8d1cd: (-s ours) am ce6b0b64: (-s ours) am b8321...Baligh Uddin2015-03-200-0/+0
| | |\ \ \
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+22
* | | | | | am 29687faf: am 3aba71d7: am 7e99b1bb: am 339b5802: am 1f527487: am 098a45a0:...Scott Kennedy2015-03-053-88/+0
|\| | | | |
| * | | | | am 3aba71d7: am 7e99b1bb: am 339b5802: am 1f527487: am 098a45a0: am 03b9eae6:...Scott Kennedy2015-03-053-88/+0
| |\ \ \ \ \
| | * | | | | am 7e99b1bb: am 339b5802: am 1f527487: am 098a45a0: am 03b9eae6: am 25ec099d:...Scott Kennedy2015-03-053-88/+0
| | |\| | | |
| | | * | | | am 339b5802: am 1f527487: am 098a45a0: am 03b9eae6: am 25ec099d: Remove unnec...Scott Kennedy2015-03-053-88/+0
| | | |\ \ \ \
| | | | * \ \ \ am 1f527487: am 098a45a0: am 03b9eae6: am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-053-88/+0
| | | | |\ \ \ \
| | | | | * \ \ \ am 098a45a0: am 03b9eae6: am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ am 03b9eae6: am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Remove unnecessary themesScott Kennedy2015-03-043-88/+0
* | | | | | | | | | | | am 7b0e4d19: (-s ours) am 7d0fa429: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 7d0fa429: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-261-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 9505ea1b: (-s ours) am bfd56c66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am bfd56c66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-121-1/+1
| | |/ / / / / / / / /
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-191-1/+1
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-101-1/+1
* | | | | | | | | | | am f2c5894c: am 6563b3d6: Bug: 18538668 Fixing index in color picker content ...Kaikai Wang2014-12-091-3/+2
|\| | | | | | | | | |
| * | | | | | | | | | am 6563b3d6: Bug: 18538668 Fixing index in color picker content description t...Kaikai Wang2014-12-081-3/+2
| |\| | | | | | | | |
| | * | | | | | | | | Bug: 18538668 Fixing index in color picker content description to be zero-basedKaikai Wang2014-12-081-3/+2
* | | | | | | | | | | am 63fb4a20: am 1f20a749: Adding custom color swatch content description supp...Kaikai Wang2014-12-092-16/+39
|\| | | | | | | | | |
| * | | | | | | | | | am 1f20a749: Adding custom color swatch content description support to color ...Kaikai Wang2014-12-082-16/+39
| |\| | | | | | | | |
| | * | | | | | | | | Adding custom color swatch content description support to color picker for ac...Kaikai Wang2014-12-052-16/+39
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-081-1/+1
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-031-1/+1
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-241-1/+1
* | | | | | | | | | | am 514c24c6: (-s ours) am f22a676a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am f22a676a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-301-1/+1
* | | | | | | | | | | | am 11b5f9cf: (-s ours) am 84d183d7: (-s ours) am b52e0c49: (-s ours) am 2cfd2...Baligh Uddin2014-10-270-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am 84d183d7: (-s ours) am b52e0c49: (-s ours) am 2cfd2cdd: (-s ours) Import t...Baligh Uddin2014-10-270-0/+0
| |\| | | | | | | | | |
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-221-1/+1
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-171-1/+1
* | | | | | | | | | | | | am 4450b165: (-s ours) am 5592cb92: (-s ours) am 7e4b088e: (-s ours) am d622d...Baligh Uddin2014-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 5592cb92: (-s ours) am 7e4b088e: (-s ours) am d622da63: (-s ours) am 2cfd2...Baligh Uddin2014-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |