summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
70d4419332 am: d1848dfb34 am: 2290893fab am: 4ec4185b02 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba620700dc62757743ef65a777521963ccc0b010
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵android-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-releaseTreehugger Robot
70d4419332 am: d1848dfb34 am: 2290893fab Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: ↵Treehugger Robot
70d4419332 am: d1848dfb34 Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib168964e9f9523bf194d54bad72eee27b73b9869
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland" am: 70d4419332android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1588927 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10e15a515775de2c4ca96177bdce7f463cb7f048
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/replicaisland"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/replicaislandBob 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: Ic516de87f307c3d66d27a2d2f7615bf5058be914
2020-11-04Fix manifest for SPaul Thomson
This app is used in the following CTS tests: android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingFast android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingSlow Bug: b/172076843 Change-Id: Ib5e5f55f7e00491b10599374648445646a0050ee
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 am: 50621b22d0 am: 63f1be6028 am: 2884d38c8e Change-Id: I7fbf4435c631dad38ee5f5690fb9b56d81c1181f
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 am: 50621b22d0 am: 63f1be6028 Change-Id: I0b1465670c0e91bd4ae407bfc3fdcf3e3e146309
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 am: 50621b22d0 Change-Id: Ic0474b389b6ee8d16e9a9029a451fb171ce423d2
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8 am: ↵Treehugger Robot
f5e2eba7a1 Change-Id: I12c05c9062fff9926a648db279076aefd7bcd274
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE" am: b95ae61ae8android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: If0835a2ac70c1fb73f075c2d90905c5812ddf8f7
2020-04-28Merge "Add METADATA to replicaisland: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to replicaisland: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ie111ad984c9b59235fdff2d4a9716f3e146fb11f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6314209690 -s ours am: 800d69926b am: 8f22f633f2 am: ef1d587b77 -s ours am skip reason: subject contains skip directive Change-Id: Ic297c4a0044b13c67a105611228303d1ddeeb5f1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6314209690 -s ours am: 800d69926b am: 8f22f633f2 Change-Id: I31d0931a7d8145070736cba56b1d90b913297a90
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6314209690 -s ours am: 800d69926b Change-Id: I3feb77277d69fc2355bd40fe60bbf370d97f0cfe
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6314209690 -s ours am skip reason: subject contains skip directive Change-Id: I8bb13bd787efb2e174179a1680fb26ecbade5727
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I019d3673b39cf3c75deb8bebe9b838e05dcf83d7
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754a ↵Treehugger Robot
am: b552376ca2 am: fdd76bee0c am: 7106431ff0 Change-Id: I3f2b0f7c3139e2c8ec84358f146add087f5bfbbf
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754a ↵Treehugger Robot
am: b552376ca2 am: fdd76bee0c Change-Id: Ifc8f95e8319cfe6df7487da58e740b578ff97bbe
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754a ↵Treehugger Robot
am: b552376ca2 Change-Id: Icef7bb68163b8d37a11aa9fc622192bdf6929db3
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754aTreehugger Robot
Change-Id: Id50887fb99afe4503cd306f5338ffe0db60cbc7b
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5c am: af3f1f754aTreehugger Robot
Change-Id: Ibb7fe00792b29a9e82492f6e5a7fbaf04b1ee88e
2020-03-24Merge "Add vts10 suite to existing vts tests" am: dff02aad5cTreehugger Robot
Change-Id: If894db7d4b07d3d2962ffd9a1f70beb0fe299ff7
2020-03-24Merge "Add vts10 suite to existing vts tests"Treehugger Robot
2020-03-24Add vts10 suite to existing vts testsDan Shi
This is to prepare renaming vts to vts10. Bug: 151896491 Test: local build Exempt-From-Owner-Approval: This CL adds all tests in vts to a new suite vts10. vts10 will be the new name of existing vts suite. This CL won't change test logic or behavior. Change-Id: I86e84e4c7ff839197c834eac8c69f3de6e852e72
2019-04-12Merge "Convert Android.mk file to Android.bp" am: 67b20324c8 am: 8ca20f3a0ar_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-releaseSasha Smundak
am: 9d7ae289b1 Change-Id: I717635d51c3e86541be0045a72619f1d69bfe5be
2019-04-12Merge "Convert Android.mk file to Android.bp" am: 67b20324c8android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6ndk-sysroot-r21android10-mainline-resolv-releaseandroid10-mainline-networking-releaseSasha Smundak
am: 8ca20f3a0a Change-Id: I2cabff00c43ae58408c4663bec85426e10dad4ad
2019-04-12Merge "Convert Android.mk file to Android.bp"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Sasha Smundak
am: 67b20324c8 Change-Id: I3f9c71108c865c6ee4ae13684ee4e052f7484ba8
2019-04-12Merge "Convert Android.mk file to Android.bp"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-03-19Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Fixes: 122332343 Test: treehugger Change-Id: I744771200d475bb2a7fe1f2498a92827e935d151
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 8467b008a8 -s ours am skip reason: subject contains skip directive Change-Id: I732cb7d6b7adb74bacb63fab035e292339f4d794
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I69b2d5f95ac1cff2c0a1902eaef7ce8f0a958539
2019-01-11Merge "Add default code reviewers into OWNERS" am: 967fb73717 am: d5f09f7201Chih-hung Hsieh
am: 81c5550ce6 Change-Id: Id28cca89658560d50b53f7e5602e2191213004b3
2019-01-11Merge "Add default code reviewers into OWNERS" am: 967fb73717Chih-hung Hsieh
am: d5f09f7201 Change-Id: I32d74bb66b9bec3b695d8d6f56792620a1e56fe1
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 967fb73717 Change-Id: Ia6e35d0b33bff6eb3efdfd5f614e6bb52ff234da
2019-01-11Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Chih-hung Hsieh
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I888eb36b254a490f169b71e19f3a918ee68a07f2
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: e5ce7ade9b -s ours am: ↵Xin Li
89b6726423 -s ours am: 8efae3572f -s ours Change-Id: If2a76f5c7d33e6cb6e07ec6c9a6e48cc1b84cb42
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: e5ce7ade9b -s oursXin Li
am: 89b6726423 -s ours Change-Id: I8580788d9d50135b2331ffa0c293e700a7770ffe
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: e5ce7ade9b -s ours Change-Id: I83d915cfecb6ab35cddae61be3648f92253efb81
2018-12-10Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I54128a9136ea50c6755e6a7b5865cd1785fd0f8c
2017-12-11Snap for 4496165 from 25276df916d2339d2345af48625c913963965402 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: I05bd5e1f134c8e832ce01a53b96b69b7d354518a
2017-12-08Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 22d02e1a04 -s ours am: ↵android-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-n-iot-release-ihome-igv1android-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-releasenougat-iot-releasemaster-cuttlefish-testing-releaseXin Li
dc0b732692 am: a2a31e9215 -s ours Change-Id: I9bd797287fd865ab1583b2fefcd7d3828ee7c496
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: Ib6b9f9ffff6a0aaec14789bacaa2e4cf59a3d0d1
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 22d02e1a04 -s oursXin Li
am: dc0b732692 Change-Id: Ib8ccce14ac3a8a0719f026de1af0930dade6f54b
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
am: 22d02e1a04 -s ours Change-Id: I8fb064569f0ee4a4a53949cf39bd35ab34f49d8d
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: d1d08805b9 -s oursXin Li
am: 47ca98472f Change-Id: If63053aa0ce5b579a27d0d1eeb29b5797ac89959
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 08:08:59 +0000