summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix overlapping text in CMAS list items." into klp-devandroid-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9kitkat-releasekitkat-cts-releasekitkat-cts-devJake Hamby2013-10-071-1/+3
|\
| * Fix overlapping text in CMAS list items.Jake Hamby2013-10-041-1/+3
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-053-3/+3
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-10-043-3/+3
| |/
* / Use proper check to detect duplicates for CMAS messagesAnju Mathapati2013-10-041-21/+28
|/
* Import translations. DO NOT MERGEandroid-4.4_r0.8Baligh Uddin2013-09-1422-3/+1683
* Merge "Import translations. DO NOT MERGE"android-4.4_r0.7Baligh Uddin2013-05-091-1/+1
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-05-081-1/+1
* | am faaf6330: am 2e572064: Merge "4373 & 4374 part of Severe Alerts"Jake Hamby2013-05-082-4/+4
|\ \ | |/ |/|
| * am 2e572064: Merge "4373 & 4374 part of Severe Alerts"tools_r22.2Jake Hamby2013-05-082-4/+4
| |\
| | * Merge "4373 & 4374 part of Severe Alerts"tools_r22jb-mr1.1-dev-plus-aospJake Hamby2013-05-072-4/+4
| | |\
| | | * 4373 & 4374 part of Severe AlertsAnju Mathapati2013-05-072-4/+4
| | |/
* | | Import translations. DO NOT MERGEBaligh Uddin2013-05-012-9/+9
* | | Import translations. DO NOT MERGEBaligh Uddin2013-04-241-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2013-04-224-18/+18
* | | Import translations. DO NOT MERGEBaligh Uddin2013-04-171-1/+1
* | | am 4198ae36: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-010-0/+0
|\| |
| * | Import translations. DO NOT MERGEandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devBaligh Uddin2013-03-291-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2013-03-291-1/+1
* | | am 5feaab03: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-181-5/+5
* | | Import translations. DO NOT MERGEBaligh Uddin2013-03-181-5/+5
* | | am 05bce802: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-140-0/+0
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-125-8/+8
* | | Import translations. DO NOT MERGEBaligh Uddin2013-03-125-8/+8
* | | am 9291ebcf: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-070-0/+0
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-0648-5/+341
* | | Import translations. DO NOT MERGEBaligh Uddin2013-03-0648-5/+341
|/ /
* | Merge "Add CMAS reminder alert feature." into jb-mr2-devJake Hamby2013-03-047-12/+269
|\ \
| * | Add CMAS reminder alert feature.Jake Hamby2013-03-047-12/+269
* | | am ba1b0524: Merge "CB: Enable or Disable broadcast messages"Jake Hamby2013-02-283-34/+136
|\ \ \ | |/ / |/| / | |/
| * Merge "CB: Enable or Disable broadcast messages"Jake Hamby2013-02-283-34/+136
| |\
| | * CB: Enable or Disable broadcast messagesRika Brooks2013-02-273-34/+136
| |/
* | Import translations. DO NOT MERGEBaligh Uddin2013-02-082-4/+4
* | am e017261e: am 6d492b6d: Merge "CB: Add CDMA CMAS"Jake Hamby2013-02-042-16/+49
|\|
| * am 6d492b6d: Merge "CB: Add CDMA CMAS"Jake Hamby2013-02-042-16/+49
| |\
| | * Merge "CB: Add CDMA CMAS"jb-mr1-dev-plus-aospJake Hamby2013-02-042-16/+49
| | |\
| | | * CB: Add CDMA CMASRika Brooks2013-02-012-16/+49
| | |/
* | | am 9ac73b35: am 9e00abc6: Merge "CB: Turn on CMAS Presidential"Jake Hamby2013-01-111-6/+20
|\| |
| * | am 9e00abc6: Merge "CB: Turn on CMAS Presidential"Jake Hamby2013-01-091-6/+20
| |\|
| | * Merge "CB: Turn on CMAS Presidential"Jake Hamby2013-01-091-6/+20
| | |\
| | | * CB: Turn on CMAS PresidentialRika Brooks2012-08-061-6/+20
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-021-2/+1
* | | | am 5419d9b2: (-s ours) am ee0979e8: am ac36d013: Import translations. DO NOT ...Baligh Uddin2012-12-120-0/+0
|\| | |
| * | | am ee0979e8: am ac36d013: Import translations. DO NOT MERGEBaligh Uddin2012-12-120-0/+0
| |\ \ \
| | * \ \ am ac36d013: Import translations. DO NOT MERGEBaligh Uddin2012-12-120-0/+0
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releasejb-mr1.1-devBaligh Uddin2012-12-121-1/+1
* | | | | | am 626bef9d: (-s ours) am 9eb0f42e: Import translations. DO NOT MERGEBaligh Uddin2012-12-120-0/+0
|\| | | | |
| * | | | | am 9eb0f42e: Import translations. DO NOT MERGEBaligh Uddin2012-12-121-1/+1
| |\| | | |
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-121-1/+1