summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Paul Duffin
96360a5935 am: 043c5d763b am: 9b345b5991 Change-Id: I00e5624f3f400b9f5563c5fb8167bb4ecc5bfb81
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935Paul Duffin
am: 043c5d763b Change-Id: I770ed88d7e07414d83dbff831f75104d901e2a6c
2017-01-18Merge "Prepare for removal of legacy-test from default targets"Paul Duffin
am: 96360a5935 Change-Id: I02a00b92016ca3ea20c8ee06a8d6fc5b7c95f2b8
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: I5d5bc7a003e660398a8238c0a0a2e1c7085ec02e
2016-07-21Import translations. DO NOT MERGEandroid-n-mr2-preview-1Bill Yi
am: 08d1b00aaa -s ours Change-Id: I872895214c093a87aced3e5229bb7317c1317dc1
2016-07-20Import 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.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_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-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-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-releaselinaro-android-7.1.1_r22Bill Yi
Change-Id: I727cb9ddc4bdb8570ee33517a2eb5f712547603d Auto-generated-cl: translation import
2016-07-01Import translations. DO NOT MERGE am: bb66b0c637 -s oursBill Yi
am: 88fc8e7e62 -s ours Change-Id: Ieb5fbc3ec55afcbe7a1ca7da2e7b58d6eda182e7
2016-07-01Import translations. DO NOT MERGEBill Yi
am: bb66b0c637 -s ours Change-Id: I7dff9eaef0028582044a207de4c2ca0b173d1b6c
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: I7622c3b91b0209845a4fab490f53e051cb410ea4
2016-06-17Import translations. DO NOT MERGE am: 88592408dd -s oursBill Yi
am: 926d16afd2 -s ours Change-Id: Id986c6bfbd07215137f3fcbdbbea8baf9239d763
2016-06-17Import translations. DO NOT MERGEBill Yi
am: 88592408dd -s ours Change-Id: I29792abcec3c74c9e555a6328461e53dda62e24f
2016-06-16Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 29390361 Change-Id: I9ce9d0f5a24ed35c7fa0622f29804377303f0b3f
2016-06-08Import translations. DO NOT MERGE am: 9f26f7bcb4 -s oursBaligh Uddin
am: 4d5b0c5d89 -s ours Change-Id: Iecf536057b94f6bfe30a76b3cff8cba8b9894674
2016-06-08Import translations. DO NOT MERGE am: 9f26f7bcb4 -s oursBaligh Uddin
am: 5e172c0abf -s ours Change-Id: I256f3478df7e6ea6a45e2a7da9d5f13b26e2d5b3
2016-06-08Import translations. DO NOT MERGEBaligh Uddin
am: 9f26f7bcb4 -s ours Change-Id: If47aee89f8e7f047d575ae077a1177479745c932
2016-06-08Import translations. DO NOT MERGEBaligh Uddin
am: 9f26f7bcb4 -s ours Change-Id: Iaac490643dd5502f82b64012f55b5f0ff4c7fd61
2016-06-07Import 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: 29169863 Change-Id: I7195f91b4ceec6e107600a317e9ddd5f92ad47f2
2016-06-05Import translations. DO NOT MERGE am: 58d444ff5f -s oursBill Yi
am: e6ff25e165 -s ours * commit 'e6ff25e165b07ab40d4e01f70c43895c5bc56320': Change-Id: Ica719f3ae7c899e383d9d24440e8ce13102f7765
2016-06-05Import translations. DO NOT MERGE am: 58d444ff5f -s oursBill Yi
am: 69ac5028c4 -s ours * commit '69ac5028c49c8050aa85ccfa52a0baa5e32de1ca': Import translations. DO NOT MERGE Change-Id: I6a259330337b74c47724b9cf7b60f79c644e02af
2016-06-05Import translations. DO NOT MERGEBill Yi
am: 7f1e3740b4 -s ours * commit '7f1e3740b4f63883e3bca11a4557c2d24fc3b84b': Import translations. DO NOT MERGE Change-Id: Id75929d90076ceb69f7105cbf3dcccffd42b962c
2016-06-05Import translations. DO NOT MERGEBill Yi
am: 58d444ff5f -s ours * commit '58d444ff5ff12cb1782a6b9853dcefdce7531482': Import translations. DO NOT MERGE Change-Id: Ica0dcc41b95d24a708db419870c5f27490786bb8
2016-06-05Import translations. DO NOT MERGEBill Yi
am: 58d444ff5f -s ours * commit '58d444ff5ff12cb1782a6b9853dcefdce7531482': Import translations. DO NOT MERGE Change-Id: I7f101ba5e768aedd048938eafc46c515bfd3e33e
2016-06-03Import translations. DO NOT MERGEBill Yi
Change-Id: I4421d452ad087e3e2315a746a95fb4f2280d77a4 Auto-generated-cl: translation import
2016-06-03Import translations. DO NOT MERGEBill Yi
Change-Id: Ic319133779fbaaf7802a87bed65f3e7bdd4ca230 Auto-generated-cl: translation import
2016-05-22Import translations. DO NOT MERGE am: 15b2a3468e -s oursBaligh Uddin
am: af300c6513 -s ours * commit 'af300c651304c78c1b81955778c5f566dd56226b': Change-Id: Icf54651cb4b714e095b1eafb7aa8627ae2e7a86f
2016-05-22Import translations. DO NOT MERGE am: 15b2a3468e -s oursBaligh Uddin
am: 872073acc9 -s ours * commit '872073acc939a139e7788f7f70906ff3e462380a': Import translations. DO NOT MERGE Change-Id: I3562aef88227f3941d6359b52d14322657a3e083
2016-05-22Import translations. DO NOT MERGEBaligh Uddin
am: 15b2a3468e -s ours * commit '15b2a3468ecb5d619803e2933298592086689aa2': Import translations. DO NOT MERGE Change-Id: Ic914f755981f827c84b600d1127f0c027c390bb7
2016-05-22Import translations. DO NOT MERGEBaligh Uddin
am: 15b2a3468e -s ours * commit '15b2a3468ecb5d619803e2933298592086689aa2': Import translations. DO NOT MERGE Change-Id: Idb4540f217c3c7821e32c3d44bc273081879d953
2016-05-21Import translations. DO NOT MERGEBaligh Uddin
Auto-generated-cl: translation import Bug: 28857042 Change-Id: Ia7a893dda5a951035a5e86d4ca0f20501fb824f0
2016-05-04Merge "Import translations. DO NOT MERGE am: 2317faf4d9 -s ours am: ↵Android Build Merger (Role)
2787b2d5df -s ours" into nyc-mr1-dev-plus-aosp
2016-05-04Import translations. DO NOT MERGE am: 2317faf4d9 -s oursBaligh Uddin
am: 2787b2d5df -s ours * commit '2787b2d5df44a721fedb9334b86c3872f0f4abca': Import translations. DO NOT MERGE Change-Id: Ie4edde9cdff097c2757f570a1d0e04d5a7863c66
2016-05-04Import translations. DO NOT MERGE am: 2317faf4d9 -s oursBaligh Uddin
am: e15bbff0c3 -s ours * commit 'e15bbff0c3f8c64075111fe91077ccde3f8ea671': Import translations. DO NOT MERGE Change-Id: I195cb9a913fdd5fd08f508693e7d4f479b9b35d6
2016-05-04Import translations. DO NOT MERGEBaligh Uddin
am: 2317faf4d9 -s ours * commit '2317faf4d9d481d5703116455575714a61040873': Import translations. DO NOT MERGE Change-Id: I43ab2347ae9b036341800ea571d5a8a90cbf2a90
2016-05-04Import translations. DO NOT MERGEBaligh Uddin
am: 2317faf4d9 -s ours * commit '2317faf4d9d481d5703116455575714a61040873': Import translations. DO NOT MERGE Change-Id: Ia79dc2fae3b73a93d430021f7e54141001b13211
2016-05-03Import translations. DO NOT MERGEBaligh Uddin
Auto-generated-cl: translation import Bug: 28463229 Change-Id: I023f01fa1c804f9fd2900dc4d3bd808767f278b6
2016-03-19Import translations. DO NOT MERGEGeoff Mendal
am: cdbcfe0 -s ours * commit 'cdbcfe0bfd7138ccb082d9b26dece6677c61e711': Import translations. DO NOT MERGE
2016-03-18Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ic0f968c566be760fdf5a5aa87fc6399de66edb7c Auto-generated-cl: translation import
2016-02-27Import translations. DO NOT MERGEBaligh Uddin
am: ed68e29f93 -s ours * commit 'ed68e29f93d49eab2c9bc5777853e498be920d68': Import translations. DO NOT MERGE
2016-02-26Import 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: Ib14db36611115d2168da96466c0092dd87f4d4bb
2016-02-25Import translations. DO NOT MERGEBaligh Uddin
am: 7763905017 -s ours * commit '77639050177b5aad1b9a2c08202c91112868317a': Import translations. DO NOT MERGE
2016-02-23Import translations. DO NOT MERGEBaligh Uddin
Auto-generated-cl: translation import Bug: 27293916 Change-Id: I17ac5e9562db2d79f3325dcda5798d03ed003301
2016-02-17Switiching to GET_ACCOUNTS_PRIVILEGED.Carlos Valdivia
am: 6ad7388949 * commit '6ad7388949a2fcfc26d1af95bfa2b498f6a5b65b': Switiching to GET_ACCOUNTS_PRIVILEGED.
2016-02-11Switiching to GET_ACCOUNTS_PRIVILEGED.Carlos Valdivia
GET_ACCOUNTS is going to be non-functional in targetSdkVersion. Bug: 21901286 Change-Id: I76a84b943c7231fbab0fd67d9d1bb7efe333ee88
2016-02-08Import translations. DO NOT MERGEGeoff Mendal
am: fb8d08926d -s ours * commit 'fb8d08926dc1a45c53f7ff52bc8886e3e7ceb154': Import translations. DO NOT MERGE
2016-02-08Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I4b7123778370b0c0e64c1479ae027e5372754512 Auto-generated-cl: translation import
2016-02-02Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 76df64b770 ↵Geoff Mendal
-s ours am: 8adaeebf29 -s ours * commit '8adaeebf297f19658d624c6aa9733299bd4b2288': Import translations. DO NOT MERGE
2016-02-02Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal
am: 76df64b770 -s ours * commit '76df64b7706d88e53cb076fcccea78aca38add0b': Import translations. DO NOT MERGE
2016-02-02Import translations. DO NOT MERGE am: 728d186e93 -s ours am: 39ff447f8f -s ↵Geoff Mendal
ours am: f95bf6e651 -s ours * commit 'f95bf6e651405f9ebbd6bab315e201a7bb78fbd3': Import translations. DO NOT MERGE
2016-02-02Import translations. DO NOT MERGE am: 728d186e93 -s oursGeoff Mendal
am: 39ff447f8f -s ours * commit '39ff447f8fabdac4743be3a512b1b19064d6b546': Import translations. DO NOT MERGE