summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH5Ypinky@build012016-08-211-0/+20
| | | | | Change-Id: I61ced344b477c016c08531146fce1a7cd18c7937 Ticket: RM-290
* Automatic translation importpinky@build012016-08-190-0/+0
| | | | | Change-Id: I53716a29dbc9dc6c6c6e477d33da61f986bb91de Ticket: RM-290
* Automatic translation importpinky@build012016-08-191-0/+20
| | | | | Change-Id: I9d163f7aa95875a21db13281ccfc6cd7098a58a3 Ticket: RM-290
* Automatic translation importblinky@build012016-08-131-0/+20
| | | | | Change-Id: I46bb6330a84eb71af83a14169f9e2691810e31a5 Ticket: RM-290
* Avoid potential NPE when tearing down LLSd34d2016-07-011-1/+1
| | | | Change-Id: Ifab8e7426c88a9d54f8986a6ff065382720bdfe2
* Revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-024-1/+64
| | | | | | | | | https://android.googlesource.com/platform/packages/screensavers/Basic into cm-13.0" This reverts commit d818b1edf56323db444d4eb660bd03d54183626a, reversing changes made to 881cddafeb983019f3e8aae16db41da1ed245641. Change-Id: I154658617602e09baf2aa452c80af9373bc57175
* Update THIRD_PARTY_KEYGUARD perm named34d2016-04-181-1/+1
| | | | | Change-Id: I10a279d19ace940837cc287edcd9a780a07d0d3c TICKET: CYNGNOS-1705
* Automatic translation importMichael Bestas2016-04-161-0/+20
| | | | Change-Id: I042672de6db91f6b8237f03bb160dcf39f8c488d
* Automatic translation importMichael Bestas2016-04-061-0/+20
| | | | Change-Id: I2855197d84db6c6ec5d939f5dffb8bd8feb30bb6
* Automatic translation importMichael Bestas2016-03-282-0/+40
| | | | Change-Id: I9d79febab38e317c22709967b46f450e754c1cd4
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-104-64/+1
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/screensavers/Basic into cm-13.0 Android 6.0.1 release 22
| * am 37fe7a24: (-s ours) am a2ffa43e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\ | | | | | | | | | | | | * commit '37fe7a2454c6c4c7ea5bb28067e37deeb57ac68b': Import translations. DO NOT MERGE
| | * am a2ffa43e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit 'a2ffa43e112f0c81a42846b8cd4b53715f702c2f': Import translations. DO NOT MERGE
| * | | am bdd571df: (-s ours) am e38a357d: (-s ours) am 039e92f7: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'bdd571dfb47b1411730e477ff8ebb522046eca26': Import translations. DO NOT MERGE
| | * | am e38a357d: (-s ours) am 039e92f7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'e38a357da6eed97cbca658eb00888d3574be3f13': Import translations. DO NOT MERGE
| * | | | am 3b0ab39d: (-s ours) am 474c4b4a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '3b0ab39ddb19bdd7ba3df1e4023cd9c8dfaa3b81': Import translations. DO NOT MERGE
| | * | | am 474c4b4a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '474c4b4a785c67cd41c214f137bf4f1714366a30': Import translations. DO NOT MERGE
| * | | | | am 8b23bed4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b23bed43a86d5c6bcfacb3eb469526bfc1ecff4': Import translations. DO NOT MERGE
* | | | | | Automatic translation importMichael Bestas2016-03-0513-0/+188
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9634a25ee7510f9fbce7d39645032efba830d745
* | | | | | Create a live lock screen for Colorsd34d2016-02-014-3/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a quick example of turning a Dream into a Live Lock Screen ;) Change-Id: Ib472037fc439db9b88bafd27d07c5aef2dd58ed6
* | | | | | Automatic translation importMichael Bestas2015-11-074-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a9b441c4646890f9922f141caaf73ab492cadab
* | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-0/+21
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | Android 6.0.0 release 26
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: Ied56670ff768fed45cc1e5bd36d92921a18963f2 Auto-generated-cl: translation import
| * | | | am 039e92f7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | * commit '039e92f7cfe121ff0c7de757a3b2bbc82577e3a1': Import translations. DO NOT MERGE
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-151-1/+1
| |_|/ |/| | | | | | | | | | | Change-Id: Ifd54902d2d66d423e54c4b40e82b2bc6e5b729c4 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-111-1/+1
|/ / | | | | | | | | Change-Id: I4dfb50648c31df88b5c7e256e9e6a34898a15ff8 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEGeoff Mendal2015-05-132-0/+42
|/ | | | | Change-Id: Ib674e1fc8a8af01f06b03833925687bea2648295 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-251-0/+21
| | | | | Change-Id: I8b810c2afcbc64b17debb99844dc500a59f0d328 Auto-generated-cl: translation import
* am 56f4a152: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-220-0/+0
|\ | | | | | | | | | | MERGE ANYWHERE. * commit '56f4a152fcb19c3b917622dd1773a90ebd8d5be9':
| * reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\
| | * am 73667881: (-s ours) am 61b83ac2: (-s ours) am ec00b01d: (-s ours) Merge ↵Baligh Uddin2015-03-200-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '73667881386d1cadeaa966f424af902533719efd':
| | * \ am 9ca319ab: (-s ours) am 24ede03f: (-s ours) am f7e63110: (-s ours) am ↵Baligh Uddin2015-03-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | e6445372: (-s ours) am e43ab101: (-s ours) Import translations. DO NOT MERGE * commit '9ca319ab079e13198063a339a8f0ee44027497cd':
| | * \ \ am 52aaef57: am 85852ad8: am 5154831f: Remove deprecated locales - DO NOT MERGEBaligh Uddin2015-03-200-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit '52aaef57b1714b45bc8a8896881890ca0770624a':
| | * \ \ \ am 3d9678ce: (-s ours) am b66b7151: (-s ours) am 92c4c9ea: (-s ours) Import ↵Baligh Uddin2015-03-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '3d9678cef03bd14cab8a9e777631afd0d2fea759':
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia116c685bcbfbf032cc4cefa391f02de1e893843 Auto-generated-cl: translation import
* | | | | | | am 9633e43f: (-s ours) am 7d245622: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9633e43f9192e678c27ae719b77f9db211fc670d': Import translations. DO NOT MERGE
| * | | | | | am 7d245622: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d245622fccf1acc8a0c6d9b52af1cdab14a4313': Import translations. DO NOT MERGE
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-264-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b87a4b33a29702f5706f485b77e6652ea04969a Auto-generated-cl: translation import
* | | | | | | am 16876c70: (-s ours) am dc62b067: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16876c704eea9ed46f90aa76faf81cb2784a1314': Import translations. DO NOT MERGE
| * | | | | | am dc62b067: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc62b0677461ea74652105415ec5283d34691fd1': Import translations. DO NOT MERGE
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-122-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78a7ae2b35c66484fd4476c56cf8d42c48b1cd43 Auto-generated-cl: translation import
* | | | | | | am 72d8d8d0: (-s ours) am 1525543c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72d8d8d0dff3aacee952d34c28ebe780251ad988': Import translations. DO NOT MERGE
| * | | | | | am 1525543c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1525543c2d8f5c7e55de68d15c1e138d3f3bbb2a': Import translations. DO NOT MERGE
| | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-304-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I749beb624f74bf018ec14c08de3a294dde092f51 Auto-generated-cl: translation import
* | | | | | | | am c5c58615: (-s ours) am 78340d05: (-s ours) am 3a090137: (-s ours) am ↵Baligh Uddin2014-10-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6c33686: (-s ours) Import translations. DO NOT MERGE * commit 'c5c58615e6ad4fc612e7fa3770964a24a966deb2':
| * | | | | | | am 78340d05: (-s ours) am 3a090137: (-s ours) am d6c33686: (-s ours) Import ↵Baligh Uddin2014-10-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '78340d050e8e92964cc9eb9ebfdf769708edde3a':
* | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-09-192-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f11554c2a871f8b43eb946ccbcff73f12ad2ea1 Auto-generated-cl: translation import
* | | | | | | | | am 69d5c9fb: (-s ours) am 17ec28d0: (-s ours) am 7b7f8d55: (-s ours) am ↵Baligh Uddin2014-09-190-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 903cc216: (-s ours) am d6c33686: (-s ours) Import translations. DO NOT MERGE * commit '69d5c9fb95555c89a58499657f1b69ef93c18089':
| * | | | | | | | am 17ec28d0: (-s ours) am 7b7f8d55: (-s ours) am 903cc216: (-s ours) am ↵Baligh Uddin2014-09-160-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | d6c33686: (-s ours) Import translations. DO NOT MERGE * commit '17ec28d0e3c4d5dab90b215bdf62754ccc0782ee': Import translations. DO NOT MERGE