diff options
author | Xin Li <delphij@google.com> | 2019-09-11 14:04:04 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-11 14:04:04 -0700 |
commit | d51aed15f06433faf85aea34d21e13215100dc10 (patch) | |
tree | 74361f3de6481b534bbbf6b390770d18e0fe1c8e /bootctrl/LegacyBootControl.cpp | |
parent | cfb924f86410923b53bd06c722c89f8c71636d70 (diff) | |
parent | d4794e7217c77f6021318ea0dba69a3286121258 (diff) |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: d4794e7217 -s ours
am skip reason: change_id Ib2a641d71ae0cd7049433d69f72cb666d236886b with SHA1 d78e8f1465 is in history
Change-Id: Ic44c4fd3f6a3c96b5d704429677e1460188260e9
Diffstat (limited to 'bootctrl/LegacyBootControl.cpp')
0 files changed, 0 insertions, 0 deletions