summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importHEADreplicant-6.0-0004-rc1cm-13.0Abhisek Devkota2017-12-143-0/+78
* Automatic translation importreplicant-6.0-0003replicant-6.0-0002replicant-6.0-0001Abhisek Devkota2017-04-281-9/+0
* Automatic translation importAbhisek Devkota2017-02-201-0/+26
* Automatic translation importpinky@build012016-09-251-0/+1
* Automatic translation importpinky@build012016-08-290-0/+0
* Automatic translation importpinky@build012016-08-273-0/+78
* Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/pla...Michael Bestas2016-05-0114-22/+104
* Automatic translation importMichael Bestas2016-04-161-0/+26
* Automatic translation importMichael Bestas2016-04-051-0/+26
* Automatic translation importMichael Bestas2016-03-272-0/+52
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-1114-104/+22
|\
| * am 4e3ae4c3: (-s ours) am 4eaca148: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\
| | * am 4eaca148: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\
| * | \ am 008f8f0d: (-s ours) am e924107c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\ \ \ | | |/ /
| | * | am e924107c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \
| * | \ \ am 10a0dc21: (-s ours) am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \
| * | \ \ \ am 6553dd6e: (-s ours) am b9e4739a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am b9e4739a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \
| * | \ \ \ \ am 6c34480e: Merge "KeyChain does not use cleartext network traffic." into mn...Alex Klyubin2015-06-091-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | am 44c777b6: Switch from KeyStore.delKey/saw to KeyStore.delete/list.Alex Klyubin2015-06-082-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 67c838de: Merge "Replace String host:port/url args with Uri arg" into mnc-devRobin Lee2015-05-141-14/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 5c26ba7d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-140-0/+0
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Automatic translation importMichael Bestas2016-03-0413-0/+266
* | | | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+108
* | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-054-5/+33
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-251-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-184-6/+32
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | am a5698f20: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1510-20/+18
| |_|_|_|_|/ |/| | | | |
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-119-17/+17
|/ / / / /
* | | | | Merge "KeyChain does not use cleartext network traffic." into mnc-devAlex Klyubin2015-06-091-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | KeyChain does not use cleartext network traffic.Alex Klyubin2015-05-201-1/+2
| | |_|/ | |/| |
* | | | Switch from KeyStore.delKey/saw to KeyStore.delete/list.Alex Klyubin2015-06-082-2/+2
|/ / /
* | | Merge "Replace String host:port/url args with Uri arg" into mnc-devRobin Lee2015-05-141-14/+6
|\ \ \ | |_|/ |/| |
| * | Replace String host:port/url args with Uri argRobin Lee2015-05-111-14/+6
* | | Import translations. DO NOT MERGEGeoff Mendal2015-05-142-0/+56
| |/ |/|
* | Track keystore password method changesChad Brubaker2015-05-073-5/+5
|/
* Import translations. DO NOT MERGEGeoff Mendal2015-04-251-0/+28
* Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+28
* Import translations. DO NOT MERGEGeoff Mendal2015-03-161-2/+2
* am 3e2ffa63: (-s ours) am 0ed51eff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
|\
| * am 0ed51eff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-266-7/+7
| |/
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-251-1/+1
* | Make UID parameter an intRobin Lee2015-02-171-3/+4
* | Merge "Use device policy suggestions when choosing alias"Robin Lee2015-02-161-7/+61
|\ \
| * | Use device policy suggestions when choosing aliasRobin Lee2015-02-041-7/+61
* | | am c5674708: (-s ours) am a3f9bea0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\ \ \ | |/ / |/| / | |/
| * am a3f9bea0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\