summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-devoreo-cts-releasePaul Duffin
a691d6c012 am: 1fc636d62b am: 488ffd1db1 am: 60d4545611 Change-Id: If8d5ee3ac45308c0a154c828286eff5939e92293
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵Paul Duffin
a691d6c012 am: 1fc636d62b am: 488ffd1db1 Change-Id: I5677f7023129dcacba6babe73e6b047e27f879b3
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: a691d6c012Paul Duffin
am: 1fc636d62b Change-Id: I70154fe27c03d4f1994f6fecd1c02c82bd03fe77
2017-01-18Merge "Prepare for removal of legacy-test from default targets"Paul Duffin
am: a691d6c012 Change-Id: Iaf54870df356ac983933b842966a9ac0076a0004
2017-01-18Merge "Prepare for removal of legacy-test from default targets"android-o-preview-1android-n-mr2-preview-2o-previewTreehugger Robot
2017-01-17Prepare for removal of legacy-test from default targetsPaul Duffin
In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Bug: 30188076 Test: make checkbuild Change-Id: I51a454298c2f03272025a20298df318192becd75
2017-01-10Rename language+country resources to just languageRoozbeh Pournader
Bug: 26496609 Test: none Change-Id: I00857704362cdf8e71abb2c2d45dc72e54639d84
2016-12-05Revert "Import translations. DO NOT MERGE"Bill Yi
This reverts commit df819a7baccad644391aa26cfa274326eaf01eea. Change-Id: If2e9c044d46fb0be7c59580927d30493de3c449b
2016-12-02Import translations. DO NOT MERGEBill Yi
Change-Id: I718f13a0af5853b111ca6e0e491429e60d706270 Auto-generated-cl: translation import
2016-11-21Import translations. DO NOT MERGE am: 4175f5e712 -s ours am: 900c4186e3 -s ↵Bill Yi
ours am: ff7a2e43c4 -s ours Change-Id: I8d096cc510d498109168fe084d109c22a7c21cf0
2016-11-21Import translations. DO NOT MERGE am: 4175f5e712 -s oursBill Yi
am: 900c4186e3 -s ours Change-Id: I35d5701bc08cbb83ffaff490eafc31954c0e7cfc
2016-11-21Import translations. DO NOT MERGEBill Yi
am: 4175f5e712 -s ours Change-Id: I29bd249051c75ae1ac3714f8f9d96fb0b4147490
2016-11-20Import translations. DO NOT MERGEandroid-n-mr2-preview-1Bill Yi
Auto-generated-cl: translation import Bug: 32177112 Change-Id: I99e3a7ba69411e354ae866ebf4bb738d1240c8c5
2016-11-05Import translations. DO NOT MERGE am: 92d2dc9287 -s oursBill Yi
am: 912bac0ff8 -s ours Change-Id: Icb338cd8f6b95190bce52009720d5b2710b6426c
2016-11-05Import translations. DO NOT MERGEBill Yi
am: 92d2dc9287 -s ours Change-Id: Ia90527dd7c28dbac9d9fcba1cdb037418de46930
2016-11-04Import translations. DO NOT MERGEandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devBill Yi
Change-Id: I6120c4f6f93373dc0ad95a68bde8a6e0800b061a Auto-generated-cl: translation import
2016-11-01Import translations. DO NOT MERGEBill Yi
Change-Id: I032aa66e5ba97374e3bb0f293670b3b88fceb123 Auto-generated-cl: translation import
2016-10-10Import translations. DO NOT MERGEBill Yi
Change-Id: Ie716d1e1142c251cbc7e74cc6ed8f223dd2e9be5 Auto-generated-cl: translation import
2016-06-30Import translations. DO NOT MERGE am: 7bbd1e4029 -s ours am: 2a224c7028 -s ↵Bill Yi
ours am: 0ea4a530c2 -s ours Change-Id: I862114a8873f43e912aa22a359e8dc3b556dd7c9
2016-06-30Import translations. DO NOT MERGE am: 7bbd1e4029 -s oursBill Yi
am: 2a224c7028 -s ours Change-Id: I497a2e62e1715874d44148875aec1c6d4e7647c1
2016-06-30Import translations. DO NOT MERGEBill Yi
am: 7bbd1e4029 -s ours Change-Id: Ifb5d6da4b7916ea076a1ab133a9bf4d7ea9996fd
2016-06-30Import translations. DO NOT MERGEandroid-n-mr1-preview-2android-n-mr1-preview-1Bill Yi
Auto-generated-cl: translation import Bug: 29390361 Change-Id: I500ea4e444be39e1537c83a5c296365bd57fdb4d
2016-06-17Import translations. DO NOT MERGE am: 5910ddb8f3 -s ours am: fcf7377d29 -s ↵Bill Yi
ours am: a49a8275e1 -s ours Change-Id: Iffb68ddd79163a117f77d82eb37075d33a200cda
2016-06-17Import translations. DO NOT MERGE am: 5910ddb8f3 -s oursBill Yi
am: fcf7377d29 -s ours Change-Id: I6d9ad2e14b19ba590c1598d8ff228e9f34a825ec
2016-06-17Import translations. DO NOT MERGEBill Yi
am: 5910ddb8f3 -s ours Change-Id: I49f1a7af5ab5fc5e21fd3361aca9f66e1eefb64d
2016-06-16Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 29390361 Change-Id: I3a4d5ef9e1222552bce9a6f4fa4b0aab44c794c3
2016-06-04Import translations. DO NOT MERGE am: 037a17a13e -s oursBill Yi
am: b8704bf4eb -s ours * commit 'b8704bf4eb34693fee52413c0363eff6b636849d': Import translations. DO NOT MERGE Change-Id: Ic24eb866376b9f4a9fbc36d085a5dd00b60b2e2b
2016-06-04Import translations. DO NOT MERGEBill Yi
am: 037a17a13e -s ours * commit '037a17a13e341a3979da8bfea5e5f297f2367009': Import translations. DO NOT MERGE Change-Id: I41f9c5970e57ec3293d8b5eab9d8517b8a95e1ef
2016-06-03Import translations. DO NOT MERGEandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseBill Yi
Change-Id: Idfb63ecbb7a4a3c84b8b381afc0491d7cc796415 Auto-generated-cl: translation import
2016-05-22Import translations. DO NOT MERGE am: 2be2de8a77 -s ours am: 4b9c53954c -s ↵Baligh Uddin
ours am: 119aea3aad -s ours * commit '119aea3aadd1ef99f3d13172927218f3534c0b31': Change-Id: Ia8c178b2adbccbbf5d8ea89715fe90f597971a74
2016-05-22Import translations. DO NOT MERGE am: 2be2de8a77 -s ours am: 2232ef4e97 -s ↵Baligh Uddin
ours am: 0246588440 -s ours * commit '0246588440c6c10d8ef6f2a62ca1626a83802830': Import translations. DO NOT MERGE Change-Id: I6dc0beda6f7cca2a6fb7644d125c608c5dadc824
2016-05-22Import translations. DO NOT MERGE am: 2be2de8a77 -s oursBaligh Uddin
am: 4b9c53954c -s ours * commit '4b9c53954ce35d61b22b792536adb6f0be06df8e': Change-Id: I122ee42af3a2bfc8fab110cc150fb213892a61c0
2016-05-22Import translations. DO NOT MERGE am: 2be2de8a77 -s oursBaligh Uddin
am: 2232ef4e97 -s ours * commit '2232ef4e9792fb2ef3337c084377a4cdad6e3741': Import translations. DO NOT MERGE Change-Id: I24ccbf476d8304905a726ca6695183e1d4b8fd9f
2016-05-22Import translations. DO NOT MERGEBaligh Uddin
am: 2be2de8a77 -s ours * commit '2be2de8a77c1afd4b23a5fdfb5acf16541c6670f': Import translations. DO NOT MERGE Change-Id: I53f45124b67d008eb722f0f33b216d4347dddeae
2016-05-22Import translations. DO NOT MERGEBaligh Uddin
am: 2be2de8a77 -s ours * commit '2be2de8a77c1afd4b23a5fdfb5acf16541c6670f': Import translations. DO NOT MERGE Change-Id: I97107f10f04ff44883a2882b5415e7498e269aa0
2016-05-21Import translations. DO NOT MERGEandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-releaseBaligh Uddin
Auto-generated-cl: translation import Bug: 28857042 Change-Id: I3039f32a65d494a688652e408d0ce12e9c50bc42
2016-05-16Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I13e1697dcaf1f8e0c85bfa50e3a7dc55b87700cd Auto-generated-cl: translation import
2016-03-19Merge "Import translations. DO NOT MERGE"Geoff Mendal
2016-03-18Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I1de01fefe3cd117c0ba6a4784a41cfa635da0be0 Auto-generated-cl: translation import
2016-03-19Import translations. DO NOT MERGE am: cad7535 -s oursGeoff Mendal
am: 1ab6e4d -s ours * commit '1ab6e4d22b6b7e275ea9a0bb2acd441247417b46': Import translations. DO NOT MERGE
2016-03-19Import translations. DO NOT MERGEGeoff Mendal
am: cad7535 -s ours * commit 'cad7535987ceef01fd26287d4cbf176223c3ae82': Import translations. DO NOT MERGE
2016-03-18Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I665864866a3d33f39d4db09bbf6aea72c23e3bce Auto-generated-cl: translation import
2016-02-25Import translations. DO NOT MERGE am: 3a349b674e -s oursBaligh Uddin
am: 2a8530f5d8 -s ours * commit '2a8530f5d87c28360d02073969d4726a5623005e': Import translations. DO NOT MERGE
2016-02-25Import translations. DO NOT MERGEBaligh Uddin
am: 3a349b674e -s ours * commit '3a349b674ea5b38b704e80eed0190f4c41e66fce': Import translations. DO NOT MERGE
2016-02-23Import translations. DO NOT MERGEandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Baligh Uddin
Auto-generated-cl: translation import Bug: 27293916 Change-Id: Ia95f8c91edc3612536ab6a439f4f5137d88add38
2016-02-02Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 452b5f505c ↵Geoff Mendal
-s ours am: 903a146010 -s ours * commit '903a14601079a2b3645001f70909b70d8db0167e': Import translations. DO NOT MERGE
2016-02-02Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal
am: 452b5f505c -s ours * commit '452b5f505ca3b95a1d834b79a99b0bdc4a3b7cc2': Import translations. DO NOT MERGE
2016-02-02Import translations. DO NOT MERGE am: a9937ae705 -s ours am: 201781ff74 -s ↵Geoff Mendal
ours am: 69f64841fe -s ours * commit '69f64841fe7a3217171dd7f96938fe519fb8ebf5': Import translations. DO NOT MERGE
2016-02-02Import translations. DO NOT MERGE am: a9937ae705 -s oursGeoff Mendal
am: 201781ff74 -s ours * commit '201781ff74e357d6170210480c699f6ee176615f': Import translations. DO NOT MERGE
2016-02-02Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal