aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/stressapptest" am: ↵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-1Bob Badour
224318dd6a am: f2ebd6f5f6 am: 64aed3c543 Original change: https://android-review.googlesource.com/c/platform/external/stressapptest/+/1575986 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibe3faabede02bf4ec2c11a1ab22c9fff0ed377fd
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/stressapptest" am: ↵Bob Badour
224318dd6a am: f2ebd6f5f6 Original change: https://android-review.googlesource.com/c/platform/external/stressapptest/+/1575986 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2aeabb8659c117d8f8f8a0694ace331fd757f04
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/stressapptest" am: 224318dd6aandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/stressapptest/+/1575986 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ce2cd942ae6e119a049c63b189f59c52a261e9b
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/stressapptest"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/stressapptestBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT legacy_notice to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia51dc21f437364bc42ca17eb960c79b76340f776
2020-04-11Merge "Upgrade to stressapptest v1.0.9." am: a27d5f2bda am: 4ac7a2a986 am: ↵Treehugger Robot
bdd51fde76 am: 5d78aca286 am: c57b2ee389 Change-Id: I4930cd86509b151e43f01f19769d35712dd8bc5a
2020-04-11Merge "Upgrade to stressapptest v1.0.9." am: a27d5f2bda am: 4ac7a2a986 am: ↵Treehugger Robot
bdd51fde76 am: 5d78aca286 Change-Id: I3700b1d5a392cf8200b65bdbee1645ebeeec7a42
2020-04-11Merge "Upgrade to stressapptest v1.0.9." am: a27d5f2bda am: 4ac7a2a986 am: ↵Treehugger Robot
bdd51fde76 Change-Id: Ic579ce4bbec2e22e3341bb67122427dc76e1d556
2020-04-11Merge "Upgrade to stressapptest v1.0.9." am: a27d5f2bda am: 4ac7a2a986Treehugger Robot
Change-Id: Ieb568f332f0b03b6de364cb7d3d482c62a3cbbcc
2020-04-11Merge "Upgrade to stressapptest v1.0.9." am: a27d5f2bdaandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: Id18b43696b90603345a2b1037ec648b9671b9714
2020-04-10Merge "Upgrade to stressapptest v1.0.9."Treehugger Robot
2020-04-10Upgrade to stressapptest v1.0.9.Elliott Hughes
We already had some cherrypicks from v1.0.9 in the tree for arm64 support. Fix up Android.bp to declare the cpu type. Add METADATA. Test: treehugger Change-Id: Id5a64382bb3215d8933537e1c7ed5fbc7c3347f7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0598eae398 -s ours am: 4a6a0d35dc am: a3642b6a94 am: f00a48c77b -s ours am skip reason: subject contains skip directive Change-Id: I3d53f8d238c1cba64efa321e3b5d403d617c3129
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0598eae398 -s ours am: 4a6a0d35dc am: a3642b6a94 Change-Id: Id6ab7490b002f6f14c98799d5344ff508bfd20cf
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0598eae398 -s ours am: 4a6a0d35dc Change-Id: Ia64fa83f3cb33fbfd0a9bdf896fce152450ff500
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0598eae398 -s ours am skip reason: subject contains skip directive Change-Id: I3c9f855a79967c86a0a2399238feac3c7e252094
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I65e7c1fd0845d0eff5c0bb1765f34ffe082ac61c
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 651bef6ed9 -s ours am: 4457be711f am: c9ed63f95a am: 4c96b16516 -s ours am skip reason: subject contains skip directive Change-Id: Icb9e2203903a5922012abc04b80cad15dcff9a8b
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 651bef6ed9 -s ours am: 4457be711f am: c9ed63f95a Change-Id: I94c100ba76b85383761aaa9e444824caba10e6ab
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 651bef6ed9 -s ours am: 4457be711f Change-Id: I08fbce704e3f63217ab06549d0f7f4d4e7135a71
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 651bef6ed9 -s ours am skip reason: subject contains skip directive Change-Id: I78c510db5d968fc192f7c0b86d205229e45d77e4
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 651bef6ed9 Change-Id: I50461b4da17c6ca8eef103f7f208517934acc0e6
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iea1f9be9ca215735af08e48ca8b46afa06a8248c
2020-03-18Print pattern name, CPU on errorNick Sanders
Print pattern name and source CPU on error, for better debuggability. BUG=None TEST=run with --force_errors Signed-off-by: Nick Sanders <nsanders@chromium.org>
2020-03-09Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4a am: dbe1db07e8 ↵Automerger Merge Worker
am: 778644cae3 am: ed4f2e147f Change-Id: I6c81bc338f70b5746365eb2b632626ca6486e688
2020-03-09Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4a am: dbe1db07e8 ↵Automerger Merge Worker
am: 778644cae3 Change-Id: I52c3fff7b6567b5e314892736cfa97d6c4875651
2020-03-09Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4a am: dbe1db07e8Automerger Merge Worker
Change-Id: Id66af7361294c86a74928a417adfe98ce69c2524
2020-03-09Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4aAutomerger Merge Worker
Change-Id: I9278e39647742f001b55e40d8f7e7bf10dc1b8e0
2020-03-09Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4aAutomerger Merge Worker
Change-Id: I2e35dfc0ba64379be18a226a4675990c4332caf9
2020-03-09Merge "Remove mips workaround." am: d621bdcd9aAutomerger Merge Worker
Change-Id: Ib017c727765552db63b7ad03d50622680d841a7f
2020-03-09Merge "Remove mips workaround."android-r-preview-4android-r-preview-3android-r-preview-2Treehugger Robot
2020-03-06Remove mips workaround.Elliott Hughes
Also replace OWNERS with the janitors because the only person in OWNERS no longer works on Android. Test: treehugger Exempt-From-Owner-Approval: fixing OWNERS Change-Id: Ia3ef0bb7495485242033c7e47c15d077e883e808
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospr_aml_301500702q_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-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-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-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-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r6android-11.0.0_r5android-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_r4android-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_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-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_r10android-11.0.0_r1android-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-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-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-platform-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-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-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: 5f57f889ea Change-Id: Ifeaf7925f8bd56e7792d0d107a2175ae6e2ffc97
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I128c0bcfdfca76795c45956365858c5f3cc272d1
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: Ia9eaedc64aa8e9ab7c1a10edc175415c09fcf13a
2019-01-17Merge "Add default code reviewers into OWNERS" am: 8786f59681 am: 40943bcb43Chih-hung Hsieh
am: c427ddeffd Change-Id: I6cc8e2fa2368e52bbea5aa9c8ce9ec89ea0b2fdd
2019-01-17Merge "Add default code reviewers into OWNERS" am: 8786f59681Chih-hung Hsieh
am: 40943bcb43 Change-Id: I1b734461e51be0fc1b3707d91927804ed650a0a7
2019-01-17Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 8786f59681 Change-Id: I6677df6f7e4c3e0dcba2ae50fd4f25967a6f7feb
2019-01-17Merge "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.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-09Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I1d8b041dc30e318ede04797ea36d7b65093008d6
2018-11-20Merge "Convert stressapptest to Android.bp" am: 43255662e6 am: d59d9c46eeDan Willemsen
am: 3a6d1cb4a4 Change-Id: I6baca5428f76aadf30961ae94c8c016c5f9502eb
2018-11-20Merge "Convert stressapptest to Android.bp" am: 43255662e6Dan Willemsen
am: d59d9c46ee Change-Id: I91aff25571759b65f681b187c506d6d71bf75d96
2018-11-20Merge "Convert stressapptest to Android.bp"Dan Willemsen
am: 43255662e6 Change-Id: I8b6762e14a87f1aa159216f05ad9dd3fb25c7173
2018-11-20Merge "Convert stressapptest to Android.bp"android-wear-8.0.0_r2android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-11-19Convert stressapptest to Android.bpDan Willemsen
See build/soong/README.md for more information. Test: cd external/stressapptest; mma Change-Id: If3eba20f5f14df0ca43bff53f3dc9e6313cf03b1
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 86d34ada13 -s ours am: 476c055010 -s ours am: a01b84ff0b -s ours Change-Id: I0ac0c8561c3152004fd99496d27cf428f7a47727
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 86d34ada13 -s ours am: 476c055010 -s ours Change-Id: Id38d729cae4904405a81a7163e937cdb8d6c6bd8
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 86d34ada13 -s ours Change-Id: Ifeeacb735b8ff3581436c9a13b25cda96cf2df9b
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-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-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-fcsBill Yi
Change-Id: Ic4bfa3b95c216254dfa27b040dc6104b86ac0208
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: f8314ff47f -s ours am: 19c77a2db1 -s ours Change-Id: Ifca39000550c2fb6b381dd525d26ef06e21bcd41
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 14:50:49 +0000