summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: ↵android-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_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_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-releaseTao Bao2019-05-310-0/+0
|\ | | | | | | | | | | | | | | 308431ceb7" into qt-dev-plus-aosp am: 6bd5b61b99 am: 4e5d401048 Change-Id: I12a45eddf26a4f6d87392720b49f4183b4dff139
| * Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android10-mainline-resolv-releaseandroid10-mainline-networking-releaseTao Bao2019-05-310-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | 308431ceb7" into qt-dev-plus-aosp am: 6bd5b61b99 Change-Id: Ied1ad3ab0a7a1e555aac2343c20a87d794873e9f
| | * Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: ↵ndk-sysroot-r21Android Build Merger (Role)2019-05-310-0/+0
| | |\ | | | | | | | | | | | | 308431ceb7" into qt-dev-plus-aosp
| | | * Remove Android.mk rules for building bootctrl. am: 7bde6868ffTao Bao2019-05-311-30/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 308431ceb7 Change-Id: I30882f03d7eb957452fefc71d2aa85b2b536344f
* | | | | Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 308431ceb7 ↵Tao Bao2019-05-311-30/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cf2985d914 am: 532c3f7a28 Change-Id: I67bff9213fae39903c1390211e8917a1986d3fed
| * | | | Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 308431ceb7Tao Bao2019-05-311-30/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cf2985d914 Change-Id: I65b765e0c382f6c377a98e2b56703c94cf799c59
| | * | | Remove Android.mk rules for building bootctrl. am: 7bde6868ffTao Bao2019-05-311-30/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | am: 308431ceb7 Change-Id: I0120922025265fd8008e83c03661afb433838a86
| | | * Remove Android.mk rules for building bootctrl.Tao Bao2019-05-311-30/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 7bde6868ff Change-Id: I63a8e9654c1d230e28ec81cb5a0aa83f019ac087
| | | | * Remove Android.mk rules for building bootctrl.android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Tao Bao2019-05-281-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the targets that need the bootctrl.$(TARGET_BOARD_PLATFORM) in this dir should build the module with Android.bp, which is also the desired way to install the recovery variant of bootctrl. [1] has an example change for crosshatch. We also no longer need BOARD_IS_AUTOMOTIVE, as the module must be explicitly included now, in order to be built with namespace-scoped Android.bp. [1] https://android-review.googlesource.com/c/device/google/crosshatch/+/958004 Bug: 34254109 Test: TreeHugger Change-Id: Ib110508065f47a742acd92e03ea42901e8002e4f
* | | | | [automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102 ↵Tao Bao2019-05-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a74148dd46 -s ours am: bd3f15889d -s ours am: dba5dbfaf6 -s ours am skip reason: change_id I864bd626d25723bd390b2453022d9cd47a54d2a2 with SHA1 e3818e1e44 is in history Change-Id: Ie8217f2516df698597e366520aadc8af81e267a4
| * | | | [automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102 ↵Tao Bao2019-05-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a74148dd46 -s ours am: bd3f15889d -s ours am skip reason: change_id I864bd626d25723bd390b2453022d9cd47a54d2a2 with SHA1 e3818e1e44 is in history Change-Id: I2ea64c40fba8edc642b39a858d89ce075cc3b934
| | * | | [automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102Tao Bao2019-05-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a74148dd46 -s ours am skip reason: change_id I864bd626d25723bd390b2453022d9cd47a54d2a2 with SHA1 e3818e1e44 is in history Change-Id: Ibb29585be357552295e2eafa91a19780751f875f
| | | * | Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-271-5/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: b229dfc102 Change-Id: Ie64758e8599572f491465673c38e1d35c0d8b8d1
| | | | * Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-241-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.mk itself will be removed in a separate CL. Bug: 34254109 Test: TreeHugger Test: Sideloading a package on sailfish. Change-Id: I864bd626d25723bd390b2453022d9cd47a54d2a2 Merged-In: I864bd626d25723bd390b2453022d9cd47a54d2a2 (cherry picked from commit e3818e1e44e3f2b4b0296132dbc185da92f99c66)
* | | | | Build bootctrl.msm8996 with Android.bp. am: e3818e1e44Tao Bao2019-05-241-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d4e96c0bd5 Change-Id: Icc07b5630788165490ceeed7bd4b6849f5b34d2c
| * | | | Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-241-5/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e3818e1e44 Change-Id: I61c092e143724aaff4da4d0b83b3422e77c28031
| | * | | Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.mk itself will be removed in a separate CL. Bug: 34254109 Test: TreeHugger Test: Sideloading a package on sailfish. Change-Id: I864bd626d25723bd390b2453022d9cd47a54d2a2
* | | | | [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ↵Tao Bao2019-05-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1933d30528 am: 43dc9da33d -s ours am: e0d83c800e -s ours am: 7a64857fe8 -s ours am skip reason: change_id I6a85b7885903df818deb32c40c751ac4358a6dbc with SHA1 7ba68ec1d2 is in history Change-Id: I414d0cd5018ce655502956efba5d519886062bd9
| * | | | [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ↵Tao Bao2019-05-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1933d30528 am: 43dc9da33d -s ours am: e0d83c800e -s ours am skip reason: change_id I6a85b7885903df818deb32c40c751ac4358a6dbc with SHA1 b3fede0de5 is in history Change-Id: I0ad32434a309aade5d5d5c75cdbcf0ab27f3449c
| | * | | [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ↵Tao Bao2019-05-230-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1933d30528 am: 43dc9da33d -s ours am skip reason: change_id I6a85b7885903df818deb32c40c751ac4358a6dbc with SHA1 b3fede0de5 is in history Change-Id: Idd58d7f789664bb28574a9f92612d7cdbdb78862
| | | * | Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-231-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 1933d30528 Change-Id: I37fe6e2df13148bd257dc0935614263437ddd358
| | | | * Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28b533bd96d92d7a3bf880575b183cfffe05cd12. Bug: 34254109 Test: Sideload on taimen. Change-Id: I6a85b7885903df818deb32c40c751ac4358a6dbc Merged-In: I6a85b7885903df818deb32c40c751ac4358a6dbc (cherry picked from commit 7ba68ec1d2175905bbfecab5d4a57503bdcb9f76)
* | | | | [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ↵Tao Bao2019-05-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3fede0de5 am: a707a74460 -s ours am skip reason: change_id I6a85b7885903df818deb32c40c751ac4358a6dbc with SHA1 7ba68ec1d2 is in history Change-Id: I6aa9e4c4f0d03eaf99f3e6a85dc2efae63b7fbcd
| * | | | Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-231-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b3fede0de5 Change-Id: I2cc39b19de80a5ced9e03068c42fac1a9f70bff4
| | * | | Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28b533bd96d92d7a3bf880575b183cfffe05cd12. Bug: 34254109 Test: Sideload on taimen. Change-Id: I6a85b7885903df818deb32c40c751ac4358a6dbc Merged-In: I6a85b7885903df818deb32c40c751ac4358a6dbc (cherry picked from commit 7ba68ec1d2175905bbfecab5d4a57503bdcb9f76)
* | | | | [automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43f ↵Tao Bao2019-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 11303fbc52 -s ours am: d79ae8a695 -s ours am: f63ed7dd27 -s ours am skip reason: change_id Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 with SHA1 aa97ef614c is in history Change-Id: I2605684f1ceb5a102caf88338a39769d3fa8df40
| * | | | [automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43f ↵Tao Bao2019-05-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 11303fbc52 -s ours am: d79ae8a695 -s ours am skip reason: change_id Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 with SHA1 aa97ef614c is in history Change-Id: I5759604db1c98b80792e6b95a89431643d496bf7
| | * | | [automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43fTao Bao2019-05-220-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 11303fbc52 -s ours am skip reason: change_id Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 with SHA1 aa97ef614c is in history Change-Id: I7e53587f93d9a8623221d8d0236cd36db38c62e7
| | | * | Build bootctrl.sdm710 with Android.bp.Tao Bao2019-05-221-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: c665a9c43f Change-Id: I0f3fd68c9abddbe3099fce17415dea5cba7888db
| | | | * Build bootctrl.sdm710 with Android.bp.Tao Bao2019-05-211-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 34254109 Test: TreeHugger Test: Sideloading a package on bonito. Change-Id: Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 Merged-In: Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 (cherry picked from commit aa97ef614cbfaca768fb382a659a764b13879a2b)
* | | | Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28b533bd96d92d7a3bf880575b183cfffe05cd12. Bug: 34254109 Test: Sideload on taimen. Change-Id: I6a85b7885903df818deb32c40c751ac4358a6dbc
* | | | Build bootctrl.sdm710 with Android.bp. am: aa97ef614cTao Bao2019-05-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 4a31dcda25 Change-Id: I821527fa663c0d8a66c9b5700978ee7a37a33763
| * | | Build bootctrl.sdm710 with Android.bp.Tao Bao2019-05-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: aa97ef614c Change-Id: Ia898073a447ae935655d9abe698bc81796849daf
| | * | Build bootctrl.sdm710 with Android.bp.Tao Bao2019-05-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Bug: 34254109 Test: TreeHugger Test: Sideloading a package on bonito. Change-Id: Ib29d901b44ad0ec079c3e979bfdcd467e1a18377
* | | Merge "Revert "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-151-1/+1
|\ \ \
| * | | Revert "Build bootctrl.msm8998 with Android.bp."Tao Bao2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e28bad89bfd0efbcaf86099a77b809496ca6bab8. Reason for revert: broken aosp_x86-eng checkbuild Bug: 34254109 Change-Id: Ie6982947ee015631612c2f123adb1b1a23a83dfd
* | | | Merge "Build bootctrl.msm8998 with Android.bp."Tao Bao2019-05-151-1/+1
|\| | |
| * | | Build bootctrl.msm8998 with Android.bp.Tao Bao2019-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 34254109 Test: Sideload on walleye. Change-Id: I592901bb247b5ee7c02874f115b85e4193d4f663
* | | | [automerger skipped] Build bootctrl.sdm845 using Android.bp am: c5847fc02a ↵Hridya Valsaraju2019-05-090-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | am: 5051c3097b -s ours am: 1dfaf9500d -s ours am skip reason: change_id I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 with SHA1 299fb68f34 is in history Change-Id: Ifc8d14d488782d98b8d39a7d56da1d88fda8f915
| * / [automerger skipped] Build bootctrl.sdm845 using Android.bp am: c5847fc02aHridya Valsaraju2019-05-090-0/+0
|/| | | |/ | | | | | | | | | | am: 5051c3097b -s ours am skip reason: change_id I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 with SHA1 299fb68f34 is in history Change-Id: I0a98d713a076ee4a864280a23b2f09040d4fd5cc
| * Build bootctrl.sdm845 using Android.bpHridya Valsaraju2019-05-092-1/+35
| |\ | | | | | | | | | | | | | | | am: c5847fc02a Change-Id: Ic8baddf15049220ba7afac70fbc9d2587ec1610d
| | * Build bootctrl.sdm845 using Android.bpHridya Valsaraju2019-05-082-1/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This is required to build a recovery variant of the same to be used by fastbootd. Bug: 78793464 Test: make Bug: 34254109 Change-Id: I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 Merged-In: I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 (cherry picked from commit 299fb68f3461157b7a018d8f46b51ed11f7470a5)
* | Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r4android-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 Li2019-02-250-0/+0
|\ \ | | | | | | | | | | | | | | | am: 5344bb3347 Change-Id: Ib86af3dbaf18f91accb7a52153c7a323fb629bbc
| * | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | | | | | | | | | Bug: 126125118 Change-Id: Ibe1e43941c3e090c084d4733ef172b83f6fe8dfd
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Idff03bd5fb5542cca89563acdaf441277b17f90f
* | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85722738b9 -s ours am: eb69be82f4 -s ours am: b7fcc111b7 -s ours am skip reason: subject contains skip directive Change-Id: I3dc04b878cfb9d39f468cad199c679c685e555fe
| * | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li2019-02-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85722738b9 -s ours am: eb69be82f4 -s ours am skip reason: subject contains skip directive Change-Id: I762c1ba0200a314b0574a0287d3c9e902e20b6cf
| | * | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 85722738b9 -s ours am skip reason: subject contains skip directive Change-Id: I4f9a3e3802b5bf8c9dcf925a846b78c37bb41d85
| | | * \ DO NOT MERGE - Merge PPRL.190205.001 into masterandroid-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-releaseXin Li2019-02-181-1/+6
| | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | Bug: 124234733 Change-Id: I90b834b483440832ad988373377403bd0bf94a4c
* | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 1b00213918 -s ours am: 288d592f5b -s ours am skip reason: subject contains skip directive Change-Id: I8c465e303cdd5be00eb7372dde71ebdae5ab3b8a