diff options
author | Xin Li <delphij@google.com> | 2019-09-11 15:43:36 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-11 15:43:36 -0700 |
commit | 4bb65995574f6ae36e6bdeee1f57f94de5e2905c (patch) | |
tree | 83e05602b5348fe63fc48a5112ed27916622c87c /bootctrl/LegacyBootControl.cpp | |
parent | 90590979d7a6edbc93ed58ec8c207353c034dc1e (diff) | |
parent | 8e1655c0dd7dd7c262e936505b3e710279e818de (diff) |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d4794e7217 -s ours am: d51aed15f0 -s ours
am: 8e1655c0dd -s ours
am skip reason: change_id Ib2a641d71ae0cd7049433d69f72cb666d236886b with SHA1 d78e8f1465 is in history
Change-Id: I6bb5e4710edfe5135a2938172bf173f203203b5f
Diffstat (limited to 'bootctrl/LegacyBootControl.cpp')
0 files changed, 0 insertions, 0 deletions