diff options
author | Xin Li <delphij@google.com> | 2019-09-11 17:15:07 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-11 17:15:07 -0700 |
commit | b4da6c59ae303c71e148edf15c9dd3cab39db1eb (patch) | |
tree | 83e05602b5348fe63fc48a5112ed27916622c87c /bootctrl/LegacyBootControl.cpp | |
parent | 4bb65995574f6ae36e6bdeee1f57f94de5e2905c (diff) | |
parent | 200f82d52540dfb52243165b5deeb2f82c8dae3e (diff) |
[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: e04605c375 -s ours am: e0400f8cbf -s ours
am: 200f82d525 -s ours
am skip reason: change_id Ib2a641d71ae0cd7049433d69f72cb666d236886b with SHA1 d78e8f1465 is in history
Change-Id: Ibbc906782b8fe442a708adef0e5644955f624d76
Diffstat (limited to 'bootctrl/LegacyBootControl.cpp')
0 files changed, 0 insertions, 0 deletions