summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-27Stop using deprecated Canvas APIs.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devDerek Sollenberger
Bug: 73777445 Test: compile Change-Id: If7fb1a54ac6b16b108383e9ae167faa8639198b8
2018-02-27packages/apps/Launcher2: Set LOCAL_SDK_VERSION where possible.Anton Hansson
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Id2fb0111c37a6ebc5c3962cc13db9bff03f81a6f
2017-12-08Stop statically including legacy-android-testPaul Duffin
Statically including legacy-android-test leads to duplicate classes which causes build time problems (with Proguard) and runtime problems on older SDK versions. This change: * Stops statically including legacy-android-test. * Adds compile time dependencies on andoid.test.base, android.test.mock and android.test.runner where necessary. * Adds <uses-library android:name="android.test.runner"/> to any affected package to ensure that the classes that were included by legacy-android-test are still available at runtime. That also adds a dependency on android.test.base and android.test.mock. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/stress/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because LauncherRotationStressTest's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in LauncherRotationStressTest results in duplicate classes which leads to build time and compile time issues. Bug: 30188076 Test: make checkbuild Change-Id: If5e51968466472529b6dbb5b7cf858d6dce7dc5c
2017-04-26Explicitly include android-support-v4 am: 7f1d87fa8fandroid-wear-8.1.0_r1android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-p-preview-1android-o-mr1-iot-preview-6android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr1-devo-mr1-iot-preview-6Alan Viverette
am: 0269d85099 Change-Id: Ieacc71cc38d4d488ba34c732034bd40eff2bcaa8
2017-04-26Explicitly include android-support-v4android-o-mr1-preview-2android-o-mr1-preview-1Alan Viverette
am: 7f1d87fa8f Change-Id: Idb6283e01286dedc6bbe72ae5c1ff10659004978
2017-04-26Explicitly include android-support-v4android-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_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-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-devoreo-cts-releaseAlan Viverette
Test: make checkbuild tests Change-Id: Ia62442e72e76fe031242d7ddf509b4055ac81259
2017-04-21Update to use STATIC_ANDROID_LIBRARIES am: e61357b2fcAlan Viverette
am: fe41512385 Change-Id: I59b59775dc99f9c7d7eae41bb557ba4540430a80
2017-04-21Update to use STATIC_ANDROID_LIBRARIESAlan Viverette
am: e61357b2fc Change-Id: I300ebc90f7bf50dd6c83608d420eeb7f5b3bc5a6
2017-04-21Update to use STATIC_ANDROID_LIBRARIESAlan Viverette
Test: make Launcher2 Change-Id: I97df2b08bec8aec9707e9b2e2736615159f2e4fe
2017-04-21Use explicit support library prebuilts am: 48653775d9Alan Viverette
am: d147c8fbe8 Change-Id: I04ece4c6249008872aeb5c32b9d8ae52b7978390
2017-04-21Use explicit support library prebuiltsAlan Viverette
am: 48653775d9 Change-Id: Ie992259d218480bf570c43b127e7176abecb7358
2017-04-21Use explicit support library prebuiltsAlan Viverette
Test: make Launcher2 Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I06464ed810eb41455698dcabe0b605a5e51668d3
2017-04-21Fix build Launcher2 am: 51adb19e94Seigo Nonaka
am: 7d82c53db7 Change-Id: Ieb25dcb0ce379a9723c26610529aa7dc305f472f
2017-04-21Fix build Launcher2Seigo Nonaka
am: 51adb19e94 Change-Id: Icd056b362ec8f7882d3be53df0a2e75a3cf9b654
2017-04-19Fix build Launcher2Seigo Nonaka
Bug: N/A Test: N/A Change-Id: I4b2fd1e03346c0c04a5c1b9473e9e70d4023df24
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵Paul Duffin
96360a5935 am: 043c5d763b am: 9b345b5991 am: 44c1afdc7f Change-Id: Id3528148be3678f3fc9eac56943607742e377076
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
2017-01-10Rename language+country resources to just languageRoozbeh Pournader
Bug: 26496609 Test: none Change-Id: If0253160602cf262f67ca11174f3d6f32690ae02
2016-07-21Import translations. DO NOT MERGE am: 08d1b00aaa -s oursBill Yi
am: db9e56344d -s ours Change-Id: I870d298840a7359fa9c6dc496f5931ed07a3ebd5
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-11Import translations. DO NOT MERGEBill Yi
Change-Id: If9adbf5989745cee1ff1bb9603c2d0740a0bee58 Auto-generated-cl: translation import
2016-07-05Import translations. DO NOT MERGEBill Yi
Change-Id: I9488dde77a9124ff1cc3ffbd2abedd1df5454a9c Auto-generated-cl: translation import
2016-07-01Import translations. DO NOT MERGE am: bb66b0c637 -s ours am: 88fc8e7e62 -s ↵Bill Yi
ours am: 9333421286 -s ours Change-Id: I4f4fc15b29ff1595a5dfcf2f12c709f374d175c7
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 ours am: 926d16afd2 -s ↵Bill Yi
ours am: 9df15f0c70 -s ours Change-Id: Ie362eb9a94f4f3a76419ba0df771071d4618a368
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-09Import translations. DO NOT MERGEBill Yi
Change-Id: I47c1378e83e6ec9b0b4c0350b82b84ad598d934e Auto-generated-cl: translation import
2016-06-08Import translations. DO NOT MERGE am: 9f26f7bcb4 -s ours am: 4d5b0c5d89 -s ↵Baligh Uddin
ours am: 1f8ca43e99 -s ours Change-Id: Idd14cf3bd51c73214866240b3b5597ab949cd915
2016-06-08Import translations. DO NOT MERGE am: 9f26f7bcb4 -s ours am: 5e172c0abf -s ↵Baligh Uddin
ours am: 49ca9aa92f -s ours Change-Id: Ifea71e01163d0fe54cfe0151fff4a24aebd5f2c1
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-06Import translations. DO NOT MERGEBill Yi
Change-Id: Iddcf94b452ef22666757aa4e986be42de701a2b7 Auto-generated-cl: translation import
2016-06-05Import translations. DO NOT MERGE am: 58d444ff5f -s ours am: e6ff25e165 -s ↵Bill Yi
ours am: b7d791d8dc -s ours * commit 'b7d791d8dc853679caf5807bcefb7fd0b398cfbd': Change-Id: Ib298bceca7cd56738afdf96adb4a5eebc6f549c5
2016-06-05Import translations. DO NOT MERGE am: 58d444ff5f -s ours am: 69ac5028c4 -s ↵Bill Yi
ours am: ecc5e0dfb8 -s ours * commit 'ecc5e0dfb89f36ef4726ba14e77e27281077fe0e': Import translations. DO NOT MERGE Change-Id: I81c7e2780911da3eaaffde1fc3244c6ce267debe
2016-06-05Import translations. DO NOT MERGE am: 7f1e3740b4 -s oursBill Yi
am: 2457bad7c5 -s ours * commit '2457bad7c52a6a8ea3fe33cd52b006062e34008e': Import translations. DO NOT MERGE Change-Id: Id643125c8963a80ad9d1f1060c82d624a9183afe
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