summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 1ddd8b25e0 -s ours am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idec4569b60faf5ca2554cdfdf46973e15f204c14
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -s oursXin Li
am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id61c1a812567ca12bd51a8e6a14f2c896fe39068
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I790ce8d5e5e573ab896118d92c351bb43f42025c Change-Id: I85a24ccfa9b61fe44725cc42333a38772489a201
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8e am: ↵Bob Badour
9e004583de am: e12ec3530c Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46d8b833eb88d2f9d9aba0a76d27c82fb7bd9c0f
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8e am: ↵Bob Badour
9e004583de Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic5a575726d6390a7e87f588e7cd3aac591133fc6
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libbackup am: aeba4c0b8eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1588863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifed632f6c1bbed17edeaf0aac3c6264bee579bf1
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libbackupandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I0cd18951df69e39be03af00979acad5642d19e54
2020-11-24Mark ab/6881855 as merged am: 43c0d00475 am: 500d7c41bbXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/13110886 Change-Id: I87905a32ba0a9b6a1d2c1cf6d61ccfa7e419356f
2020-11-24Mark ab/6881855 as merged am: 43c0d00475Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/13110886 Change-Id: I790ce8d5e5e573ab896118d92c351bb43f42025c
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iaf6d4294144da438dc2f4546c7698e23d020bb01
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5b23f5fca3 -s ours am: ↵Xin Li
dbda981f51 -s ours am: e95465287f -s ours am skip reason: Change-Id I1e762c15b12e9308440bafaac5e574cb64e2ed9d with SHA-1 327626faf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12795749 Change-Id: I54ecbc5a279a37d975e9e4e87202a27d4bf200bf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5b23f5fca3 -s ours am: ↵Xin Li
dbda981f51 -s ours am skip reason: Change-Id I1e762c15b12e9308440bafaac5e574cb64e2ed9d with SHA-1 327626faf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12795749 Change-Id: I5e3c0e9521bbb74afa41cc5c2138e3453b1eadb0
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 5b23f5fca3 -s oursXin Li
am skip reason: Change-Id I1e762c15b12e9308440bafaac5e574cb64e2ed9d with SHA-1 327626faf9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12795749 Change-Id: Iec9ef96a64a450ada651a25b6792af18aece063b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1e762c15b12e9308440bafaac5e574cb64e2ed9d Change-Id: If39176efb9b8eb41f717a7ca046def89eb167466
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am: e3c6e55b37 -s ours am: 108cb5e0ed -s ours am: b665931af0 -s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: Id13b9de7e5d77b765b71bcc36aee5008d3d5f1d7
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am: e3c6e55b37 -s ours am: 108cb5e0ed -s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: I32a77fa7057209a3170c398f06b1c57beda03c49
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am: e3c6e55b37 -s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: Idebd9605850316d4fb78016610cefd42a5b490a7
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 ↵Xin Li
-s ours am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: I1277887afcc5822a14229831645eb9b7af0d9cfc
2020-09-11[automerger skipped] Merge Android R am: a57116554e -s oursXin Li
am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371 Change-Id: Ib2a7949b672873b706d7c8963103005336660f12
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ie7cb70566695de61c3605b1b279dff6b65275601 Change-Id: I6f755c0e8df401a65273b7484b5bbaf3aa719aa7
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am: e91bce09e8 -s ours am: 7b57d7e31a -s ours am: eaf7265601 -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: Ib301f94fe5e53d46493ace47584f5852bfd80941
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am: e91bce09e8 -s ours am: 7b57d7e31a -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: I1afe78b59239dfdcf4f728a249ab074bd6214bd4
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am: e91bce09e8 -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: I2682a23e459a600f5c2a37d9195cb309913ac150
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 7088c5a113 -s ours am skip reason: Change-Id I716019210e2540744f308510fed6ad0483c14e62 with SHA-1 17e308f8a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libbackup/+/12470072 Change-Id: Ib9eb64ea5798850b4db59101249270e3b427f8db
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I716019210e2540744f308510fed6ad0483c14e62 Change-Id: Ie7cb70566695de61c3605b1b279dff6b65275601
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4 am: ↵Bob Badour
17e308f8a6 am: 327626faf9 am: dba2b0a0f9 Change-Id: I1b45797aaf42546f22945a994636c15845f462d6
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4 am: ↵Bob Badour
17e308f8a6 am: 327626faf9 Change-Id: I7ae47a092daad75df05e012582586fdb8ad0b351
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4 am: ↵Bob Badour
17e308f8a6 Change-Id: I1e762c15b12e9308440bafaac5e574cb64e2ed9d
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903e am: 3559a596e4Bob Badour
Change-Id: I716019210e2540744f308510fed6ad0483c14e62
2020-04-29Add METADATA to libbackup: Apache2=NOTICE am: 495ccb903eandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: Idc273225ce118f9c063ec1a1233939ab4dc88d33
2020-04-28Add METADATA to libbackup: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ic5e4e26f47eccb7d2245a533902d5fda76fa5d53
2019-05-03Import from google3r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseTransformer Team
See google3/third_party/java_src/android_libs/backup/copy.bara.sky. Project import generated by Copybara. Exempt-From-Owner-Approval: Ownership was incorrectly given to the Dialer team (b/131880800), but the team members don't actually have CodeReview+2 access. PiperOrigin-RevId: 246332340 Change-Id: I5488fc9fee9019c69437887f12dda110b85bc9a3
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 6eb778c27d Change-Id: I5176a8a494ce8873c5e5a074209e512842573dc7
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I497e6042bbd2540ce6fda1a1a5e486e8691aed4a
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ifcb924cddf616ffacf07c5e7f7feaa1f49917d2d
2019-01-23Add default code reviewers into OWNERS am: 46fa5c7377 am: d622c7e7aeChih-Hung Hsieh
am: 56f98f416c Change-Id: I2b838bb365be420c91adf6d6017f52e25f2165ac
2019-01-23Add default code reviewers into OWNERS am: 46fa5c7377Chih-Hung Hsieh
am: d622c7e7ae Change-Id: I2a87eda068b1696236023081bffe687a1a6d8d70
2019-01-23Add default code reviewers into OWNERSChih-Hung Hsieh
am: 46fa5c7377 Change-Id: Ia0d3637f39f89563f22ecc560684af851ab3c826
2019-01-15Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I9632d6dea90a6feac952c65bc5d34b1cb6b4756d
2019-01-14Convert Android.mk file to Android.bp am: 1e382c1a00 am: 398d687dd9Sasha Smundak
am: 83d9a4ab4e Change-Id: I86100b18ba6881efebb491e9092ad90806764e67
2019-01-14Convert Android.mk file to Android.bp am: 1e382c1a00Sasha Smundak
am: 398d687dd9 Change-Id: Ie50e84ccc559852cf74987e96cd31ec413a8bffb
2019-01-14Convert Android.mk file to Android.bpSasha Smundak
am: 1e382c1a00 Change-Id: I925f6e70c5cd716e29b2d247f2060d3247b153b1
2019-01-14Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Change-Id: I83c6deba1a6bcf3ca557f29fcb6bb8479495c1eb Fixes: 122333013 Test: treehugger
2018-12-10[automerger skipped] DO NOT MERGE am: 7b45ebf39d -s ours am: 08e771a0ed -s ↵Xin Li
ours am: ab398c91a1 -s ours Change-Id: Idf18348099b3f914c22f44b49e11d58a3694a71b
2018-12-10[automerger skipped] DO NOT MERGE am: 7b45ebf39d -s oursXin Li
am: 08e771a0ed -s ours Change-Id: I529f21d9bac63a7f7b67d745845ac6b584b610e6
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 7b45ebf39d -s ours Change-Id: I0b52ffa27ea880a8f03d6d20f7f8d1d4d8db42ca
2018-12-07DO NOT MERGEandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Xin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Ic8c3d84d54b17e45c55c16ae22e7f87eb79a7e8e
2017-11-15Snap for 4453288 from 48482a17ecc34a0a36dce78a73db9dd934d70a7a to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I733d1948a0f25b4c98bbd075efed5e90a13cefd6
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-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-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
am: dc41adf793 Change-Id: I0eaa63c647a0941c735f58a4f0c2a149de80d051
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: I7695d2fd08a5c9723528a429b536b68089ceeb08