summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-12.1-YOG4PAbhisek Devkota2016-06-1317-0/+421
| | | | | Change-Id: I8c20173cde3d72644adc6872cfc63187b90e03c9 Ticket: RM-154
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-102-3/+3
|\ | | | | | | Android 5.1.0 release 1
| * am 2a014399: (-s ours) am 76556a1b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |\ | | | | | | | | | | | | * commit '2a014399aef1b7d404e0f7ebcf9aa4074b7c0b3c': Import translations. DO NOT MERGE
| | * am 76556a1b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |/| | | | | | | | | | | | | * commit '76556a1ba5cd0e36d610eaa3e88922e4ad654c98': Import translations. DO NOT MERGE
* | | Automatic translation importstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Michael Bestas2015-02-104-0/+116
| |/ |/| | | | | Change-Id: I137539ca8f40b975843abe65e090fbb7b6a85f61
* | Import translations. DO NOT MERGEstaging/cm-12.0-cafBaligh Uddin2014-09-142-3/+3
|/ | | | | Change-Id: Ib51344f8ffec4bdd4e09827c1caf15a1be0578e5 Auto-generated-cl: translation import
* am 6615a9e2: (-s ours) am e1e82e0b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-160-0/+0
|\ | | | | | | | | * commit '6615a9e2eacd02cdd72b1e443ceb5e53dd051a88': Import translations. DO NOT MERGE
| * am e1e82e0b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-150-0/+0
| |\ | | | | | | | | | | | | * commit 'e1e82e0b29c898b8704d1c2d8272e6bf97c318de': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I1fc7c20a12be89a167574902d7c716f907d1ff0b Auto-generated-cl: translation import
* | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-330/+0
| | | | | | | | | | | | Change-Id: I31b2c47ba0f1c1b361e33a9de56758ad36ae0b26
* | | Import translations. DO NOT MERGEBaligh Uddin2014-07-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I807d2ce4de47e5d20ee7c1191f38694bea3fb441 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-07-068-0/+240
| | | | | | | | | | | | | | | Change-Id: Id52114ceb86b538c4a4ebde4f6c81fc802c0c6e6 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-06-3015-0/+450
| | | | | | | | | | | | | | | Change-Id: I52cd28c0e6c2fa7aa51ea5e6a02ad087a0c34aee Auto-generated-cl: translation import
* | | am 24bcf666: (-s ours) am 22134505: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
|\| | | | | | | | | | | | | | * commit '24bcf6668ce3043d21ce450b6441d8f1a769c465': Import translations. DO NOT MERGE
| * | am 22134505: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
| |\| | | | | | | | | | | | | * commit '22134505411575d7c306e9828d0761acda1123a6': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2014-04-2255-48/+438
| |/ | | | | | | | | Change-Id: Iae5e2e65cb9276752a603c55c83dc58296aa4d31 Auto-generated-cl: translation import
* | Remove deprecated localesBaligh Uddin2013-12-098-240/+0
| | | | | | | | | | | | Bug:11340849 Change-Id: I747ce11f65d852f614b6466dcf7b165a454f87ed
* | am a5e0fee8: (-s ours) am 20255b65: (-s ours) am 53834361: (-s ours) am ↵Baligh Uddin2013-10-240-0/+0
|\| | | | | | | | | | | | | 4f4b2bf0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'a5e0fee8e923cfc8682eb4431bc3997ed15f649a': Import translations. DO NOT MERGE
| * am 20255b65: (-s ours) am 53834361: (-s ours) am 4f4b2bf0: (-s ours) Merge ↵Baligh Uddin2013-10-240-0/+0
| |\ | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '20255b65278cd86c346dbfb6d2d7702cef28c6ff': Import translations. DO NOT MERGE
| | * am 53834361: (-s ours) am 4f4b2bf0: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-10-240-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gb-ub-photos-carlsbad * commit '53834361c8765879ce77ce708ad1ed2cafa2d678': Import translations. DO NOT MERGE
| | | * am 4f4b2bf0: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-10-240-0/+0
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '4f4b2bf096b337e47dd330cee87eb929363bf93e': Import translations. DO NOT MERGE
| | | * Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-10-2456-49/+441
| | | |\
| | | | * Import translations. DO NOT MERGEBaligh Uddin2013-10-1656-49/+441
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd5745316887e00ae3d788c116b8ceffafc473b2 Auto-generated-cl: translation import
* | | | | am 5658ca54: am 3e391663: am 17bd2d15: fix race condition in photo dreams ↵Chris Wren2013-10-181-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings activity * commit '5658ca5457d80ecc515a3b6a29afbdc46ffef236': fix race condition in photo dreams settings activity
| * | | | am 3e391663: am 17bd2d15: fix race condition in photo dreams settings activityChris Wren2013-10-181-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '3e391663b58df16a516259a4cae2464a50d667dc': fix race condition in photo dreams settings activity
| | * | | am 17bd2d15: fix race condition in photo dreams settings activityChris Wren2013-10-181-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '17bd2d15dd9630dabf8defb353fdda8ba379f528': fix race condition in photo dreams settings activity
| | | * | fix race condition in photo dreams settings activityChris Wren2013-10-161-1/+3
| | | |/ | | | | | | | | | | | | | | | | Bug: 11225307 Change-Id: I7e52c83e172aa2e1418344fc14d438644d54dd07
* | | | am e22e0aaa: am 873939ad: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\| | | | | | | | | | | | | | | * commit 'e22e0aaa7337b8ace6e8b73427aac12fb70239be':
| * | | am 873939ad: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\| | | | | | | | | | | | | | * commit '873939ad38eb8d36e2a5c4ae697d69e0850ffe37':
| | * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \
| | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | |\ \
* | | | | | am bd9428e4: am f7642988: merge in KQS81MEd Heyl2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd9428e4e99f62f22285f70f20a9790980a34d42': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| * | | | | am f7642988: merge in KQS81MEd Heyl2013-10-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7642988d9ac1a3947630750424ee09392af9879': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| | * | | | merge in KQS81MEd Heyl2013-10-080-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Import translations. DO NOT MERGEBaligh Uddin2013-08-292-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief99dccd46303fc8aab9613a2015401ece7d0468 Auto-generated-cl: translation import
| | | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-280-0/+0
| | | |\ \
| | | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-260-0/+0
| | | | |\ \
| | | | | * | Import translations. DO NOT MERGEBaligh Uddin2013-08-238-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6425d0021eb5a75073036f0081c3621af8254044 Auto-generated-cl: translation import
* | | | | | | am 76cf4ad0: (-s ours) am 9a8ff694: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '76cf4ad077bcea8ad4c489e741a476b9d5c217d2': Import translations. DO NOT MERGE
| * | | | | | am 9a8ff694: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a8ff694ccd6cb1a1aef6a8d2a7e399b46d71f36': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I696e08968e770345b729c0fb787f444a3bdecdd2 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieaa397656af9f45989f21c8f24c17a2c1ca9d6b9 Auto-generated-cl: translation import
* | | | | | | am db082bfa: (-s ours) am 411ce378: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db082bfac9b15fcd453fa1e4c1b76ccfca0c4bf7': Import translations. DO NOT MERGE
| * | | | | | am 411ce378: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '411ce37817d7587e4ad72beb3f95586b3ee89bdf': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-282-0/+60
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief99dccd46303fc8aab9613a2015401ece7d0468 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-282-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc0c36f070547284e4ed65c3c4f2785c20b2d26b Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-288-0/+240
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-268-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If43010fd4b06633163685012085170c57fcb0979 Auto-generated-cl: translation import
* | | | | | | am 92bb6592: am 7e2828e0: am 44358fd1: remove special handling for composite ↵Chris Wren2013-08-271-2/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instant upload album. * commit '92bb65920b23ab151f8fe3bc3dd173ddef10fb33': remove special handling for composite instant upload album.
| * | | | | | am 7e2828e0: am 44358fd1: remove special handling for composite instant ↵Chris Wren2013-08-271-2/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upload album. * commit '7e2828e0f1c31c60e828abb981918642457a9260': remove special handling for composite instant upload album.