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-104-35/+1
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-214-2/+35
| * | am 03735711: am 09f6c9bd: am 51f79a16: am c48ddc27: Talkback shoudn\'t announ...Yizhen Fu2015-10-171-2/+5
| |\|
| | * am 09f6c9bd: am 51f79a16: am c48ddc27: Talkback shoudn\'t announce Photo deta...Yizhen Fu2015-10-171-2/+5
| | |\
| * | | am 71d9bb50: (-s ours) am 986e6f4b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| |
| | * | am 986e6f4b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \
| * | | | am fb20b700: am 20ad66dd: am f1e94b91: am 8518692e: am 8650d3cd: Support disa...Ken Thai2015-09-152-2/+24
| |\| | |
| | * | | am 20ad66dd: am f1e94b91: am 8518692e: am 8650d3cd: Support disabling timer-b...Ken Thai2015-09-152-2/+24
| | |\ \ \
| * | | | | am af4d173b: am 06f5c383: am 1eeb3075: am cb21a3cf: am 360feb63: Add gradle s...Andrew Flynn2015-08-281-0/+14
| |\| | | |
| | * | | | am 06f5c383: am 1eeb3075: am cb21a3cf: am 360feb63: Add gradle support to pho...Andrew Flynn2015-08-281-0/+14
| | |\ \ \ \
| * | | | | | am 001dcab4: (-s ours) am 1714d21d: (-s ours) am 59a93a06: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | |
| | * | | | | am 1714d21d: (-s ours) am 59a93a06: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \
| * | | | | | | am ce179fbd: (-s ours) am b2c6f854: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | |
| | * | | | | | am b2c6f854: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \
| * | | | | | | | am 9c3145cf: (-s ours) am 1171e6a3: (-s ours) am 9753a3ae: (-s ours) Import t...Geoff Mendal2015-06-160-0/+0
| |\| | | | | | |
| * | | | | | | | am 25cfa120: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-300-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 483d4ba6: (-s ours) am fad26c23: (-s ours) am 9e144027: (-s ours) Import t...Geoff Mendal2015-05-300-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 22d50c34: (-s ours) am a6763781: (-s ours) am b8fc0f57: (-s ours) Import t...Geoff Mendal2015-05-290-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...stable/cm-13.0-ZNH0ESteve Kondik2015-12-071-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | am 51f79a16: am c48ddc27: Talkback shoudn\'t announce Photo details twice. am...Yizhen Fu2015-10-171-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | am c48ddc27: Talkback shoudn\'t announce Photo details twice. am: e3bc739bfaYizhen Fu2015-10-171-2/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Talkback shoudn\'t announce Photo details twice.Yizhen Fu2015-10-171-2/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Talkback shoudn't announce Photo details twice.Yizhen Fu2015-10-161-2/+5
* | | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-055-2/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | / / | | | | | |_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | |
| * | | / | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-182-0/+33
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | am f1e94b91: am 8518692e: am 8650d3cd: Support disabling timer-based lights outKen Thai2015-09-152-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | / / / / / / / / / | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 8518692e: am 8650d3cd: Support disabling timer-based lights outKen Thai2015-09-152-2/+24
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 8650d3cd: Support disabling timer-based lights outKen Thai2015-09-152-2/+24
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Support disabling timer-based lights outKen Thai2015-09-152-2/+24
| * | | | | | | | | | | am 1eeb3075: am cb21a3cf: am 360feb63: Add gradle support to photoviewerAndrew Flynn2015-08-281-0/+14
| |\| | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | am cb21a3cf: am 360feb63: Add gradle support to photoviewerAndrew Flynn2015-08-281-0/+14
| |/| | | | | | | | | |/| |/ / / / / / / /
| | * | | | | | | | am 360feb63: Add gradle support to photoviewerAndrew Flynn2015-08-281-0/+14
| | |\| | | | | | |
| | | * | | | | | | Add gradle support to photoviewerAndrew Flynn2015-08-281-0/+14
| * | | | | | | | | am 59a93a06: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-151-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-111-1/+1
|/ / / / / / /
* | | | | | / am 1171e6a3: (-s ours) am 9753a3ae: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-160-0/+0
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | am 9753a3ae: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-160-0/+0
| |\| | | |
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-161-1/+1
* | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-301-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+1
| | |_|_|/ | |/| | |
* | | | | am fad26c23: (-s ours) am 9e144027: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 9e144027: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| |\| |
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-05-308-0/+132
* | | | am a6763781: (-s ours) am b8fc0f57: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-290-0/+0
|\| | | | |_|/ |/| |