aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/arm-neon-tests am: fe91d2e581 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
f03ff3ab93 am: 041fba91dd Original change: https://android-review.googlesource.com/c/platform/external/arm-neon-tests/+/1588929 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icff11239f59b9314e72db3d8b8e7431509f1ffa6
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/arm-neon-tests am: fe91d2e581 am: ↵Bob Badour
f03ff3ab93 Original change: https://android-review.googlesource.com/c/platform/external/arm-neon-tests/+/1588929 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9245135befbe5f60754ba7e59a6541e2dd87b098
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/arm-neon-tests am: fe91d2e581android-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/arm-neon-tests/+/1588929 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I565dd730a1fabba8761b0b00ffe6f1bb2b57d4cc
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/arm-neon-testsandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-1.1 SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-EPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2e10cd3b80d8984ed4bae26dfd3c996b2c2cb583
2020-04-24Add license type: contains EPL+GPL+LGPL=RESTRICTED am: 214f7c07b7 am: ↵Bob Badour
f3d72fcbc0 am: 9e49e734a3 am: 5533c4df1c am: 8c20bae693 Change-Id: I712de3c15df9bd0b89d58191a77617e0ec485015
2020-04-24Add license type: contains EPL+GPL+LGPL=RESTRICTED am: 214f7c07b7 am: ↵Bob Badour
f3d72fcbc0 am: 9e49e734a3 am: 5533c4df1c Change-Id: I48c885b50f6ae89beb548bd310194c34eeb4bfc4
2020-04-24Add license type: contains EPL+GPL+LGPL=RESTRICTED am: 214f7c07b7 am: ↵Bob Badour
f3d72fcbc0 am: 9e49e734a3 Change-Id: I315d59946c0e531501fb1667d514c72eb53aab9c
2020-04-24Add license type: contains EPL+GPL+LGPL=RESTRICTED am: 214f7c07b7 am: f3d72fcbc0Bob Badour
Change-Id: Ic8cc94d7afcb5813b86892a9bd78c2a1e98f68ac
2020-04-24Add license type: contains EPL+GPL+LGPL=RESTRICTED am: 214f7c07b7android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I3ba8c542bc0b0f0e0a949c1d3cd63b13f67f4110
2020-04-23Add license type: contains EPL+GPL+LGPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I6ded6356d5fc205d875cd0612ddd9bb7dcd17b90
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 540a2e4c74 -s ours am: 99f9ca9a69 am: aa0012160b am: cee40e070f -s ours am skip reason: subject contains skip directive Change-Id: I68f0bdd47124cadfd6808bf75c2095585d8a6d31
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 540a2e4c74 -s ours am: 99f9ca9a69 am: aa0012160b Change-Id: I95bda563f2cf3dadba174ff1ce5c74acc7e0a6fd
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 540a2e4c74 -s ours am: 99f9ca9a69 Change-Id: I0fe23785814789f83985584db4db5ef6228e814f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 540a2e4c74 -s ours am skip reason: subject contains skip directive Change-Id: Ib21bb47034bfdccef57105ce55e3e08caff1caa6
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I88d2ce5ecbe3244c1ee367af27dfa6afcdcf7655
2020-03-26Remove redundant NOTICE copied from LICENSE. am: eb60c1dc99 am: a6ba04a810 ↵Bob Badour
am: dfbd603312 am: f40e0eac8d am: 6ce9dd0eae Change-Id: If3f603d4dd18fb7e0a5e37bfdc128eab79ecb914
2020-03-26Remove redundant NOTICE copied from LICENSE. am: eb60c1dc99 am: a6ba04a810 ↵Bob Badour
am: dfbd603312 am: f40e0eac8d Change-Id: I6474212aa75389a1d77257d751400aa424cb9d43
2020-03-26Remove redundant NOTICE copied from LICENSE. am: eb60c1dc99 am: a6ba04a810 ↵Bob Badour
am: dfbd603312 Change-Id: Id209f335309140ade6ab56464cb680875130ec23
2020-03-26Remove redundant NOTICE copied from LICENSE. am: eb60c1dc99 am: a6ba04a810Bob Badour
Change-Id: I0d6468e8b557e9a0839432471d848f51e335e398
2020-03-26Remove redundant NOTICE copied from LICENSE. am: eb60c1dc99 am: a6ba04a810Bob Badour
Change-Id: I9544d808c7adeb06f0601119f0e33fca7a9e8710
2020-03-26Remove redundant NOTICE copied from LICENSE. am: eb60c1dc99Bob Badour
Change-Id: Ifef0e1a99b76e2621c5dbcec62a85e59726d6b53
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I1ad47c48d30a26c9714780dcd118ce98560e4636
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterr_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-4android-r-preview-3android-r-preview-2android-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_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-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: 14ee98cfc5 -s ours am skip reason: subject contains skip directive Change-Id: Ie2a51570a8f35b32512369c9b2fd4ee73c699c7e
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: Iffaca57f4076e545db421afc46697be26881161e
2019-01-04Add default active developers into OWNERS am: b2ce0c35e7 am: 32ac629c23Chih-Hung Hsieh
am: 995ebbbc4b Change-Id: I5b3ca6909e7fd2fde3328a7575a598af0c98923f
2019-01-04Add default active developers into OWNERS am: b2ce0c35e7Chih-Hung Hsieh
am: 32ac629c23 Change-Id: I8ac157a78b93c291865e8854a676f88959cd2e87
2019-01-04Add default active developers into OWNERSChih-Hung Hsieh
am: b2ce0c35e7 Change-Id: I881a0030ceb0577671cc0a0e8c39cdcc4747029f
2019-01-04Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-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: I3d3dfefdf1ec02f449aea153cafc39c1a956bae2
2018-11-20Convert arm-neon-tests to Android.bp am: a0b9d7a1d9 am: 1c14d44c72Dan Willemsen
am: b79e8de8c7 Change-Id: Ib8dd51e2a8f1157231f5b63f1f46e5c7e2d45afe
2018-11-20Convert arm-neon-tests to Android.bp am: a0b9d7a1d9Dan Willemsen
am: 1c14d44c72 Change-Id: Ie2cb67d7cf7b7d5f3c7ef475366dd339d5059c42
2018-11-20Convert arm-neon-tests to Android.bpDan Willemsen
am: a0b9d7a1d9 Change-Id: I4fbd027672f8df3702dcc61767c2197fee7d324e
2018-11-19Convert arm-neon-tests to Android.bpandroid-wear-8.0.0_r2android-o-mr1-iot-release-1.0.7Dan Willemsen
See build/soong/README.md for more information. Test: cd external/arm-neon-tests; mma Change-Id: If2dc58c17f0a4caad85f14a4e4347a0a84e3e926
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 45d3998c43 -s ours am: 7d47a345ed -s ours am: 9ca76c80f8 -s ours Change-Id: I763b909483b5d3b9e4d8be036fb6568338db19bf
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 45d3998c43 -s ours am: 7d47a345ed -s ours Change-Id: Ia79e41aecb82cf066a53cb45633f00673189793f
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 45d3998c43 -s ours Change-Id: I8cdf84758f885ea647e417c23056516cfb490443
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: Ic09a0592a7ecfd10c916732ca119e2f9e009754d
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 6d7c974846 -s ours am: 21a634824e -s ours Change-Id: I1fa984b05d43c196d998ecbdab8668a6b001dc3f
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 6d7c974846 -s ours Change-Id: Ibb005d3a0a8ebec2ca53b773d2ef773c289eb420
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ic9690139395c2a7db2729b06bb28b29d566603f6
2018-09-10Remove local_modifications from arm-neon-tests am: 68568be2ed am: fd717ca14eHaibo Huang
am: 6d6eb3908d Change-Id: I885cdd906fe3c8a4fcf998fca9fe68861a3a2420
2018-09-10Remove local_modifications from arm-neon-tests am: 68568be2edHaibo Huang
am: fd717ca14e Change-Id: I040fcb38ceb91c2540dde200d8cc7ceea47a7ab9
2018-09-10Remove local_modifications from arm-neon-testsHaibo Huang
am: 68568be2ed Change-Id: I2b54486126deadead6740dc06d61e10a4d00eb70
2018-09-10Remove local_modifications from arm-neon-testsandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseHaibo Huang
It doesn't provide any useful information. Local changes can be found by: git diff update_origin/master...aosp/master Also external_updater doesn't support local_modification field for now. Test: NA Change-Id: I7ab58948b72403eef1bd855c75193cff8f096c25
2018-08-08Merge Android Pie into master am: 30a7e8e204 am: 8930bbb153 am: 9f662c93c6Xin Li
am: e2b6ac2907 Change-Id: Ifac6d13b96a2091bf8e2e1f2fde4c62f2d54cfaf
2018-08-07Merge Android Pie into master am: 30a7e8e204 am: 8930bbb153Xin Li
am: 9f662c93c6 Change-Id: I2324a56246611756eeabc796be4c45afdc58e98b
2018-08-07Merge Android Pie into master am: 30a7e8e204Xin Li
am: 8930bbb153 Change-Id: I2ced7a145c2ae654a56d8a8f51c4c0a198b6a766
2018-08-07Merge Android Pie into masterXin Li
am: 30a7e8e204 Change-Id: Id4263d4b97986694072cda7f7221cda55e341373
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: Ida43c8f60ef612321d063d6e556c51a57265be24
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 4a12c6fa3dXin Li
am: 20c68d26b4 Change-Id: Ib863086f0b69feeed215f82ed2c4328cee2229fa
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 4a12c6fa3d Change-Id: Ia090eccfc496fa96b6082d6ab3a6802d0f8bf906
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 14:15:14 +0000