summaryrefslogtreecommitdiff
path: root/bootctrl/LegacyBootControl.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-11 14:51:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-11 14:51:53 -0700
commit8e1655c0dd7dd7c262e936505b3e710279e818de (patch)
tree74361f3de6481b534bbbf6b390770d18e0fe1c8e /bootctrl/LegacyBootControl.cpp
parentc0c748010aca43fdcb5a44557adc1af7b07216a9 (diff)
parentd51aed15f06433faf85aea34d21e13215100dc10 (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 skip reason: change_id Ib2a641d71ae0cd7049433d69f72cb666d236886b with SHA1 d78e8f1465 is in history Change-Id: I356bf71715e52ba139a6210e10b30e7d3d479609
Diffstat (limited to 'bootctrl/LegacyBootControl.cpp')
0 files changed, 0 insertions, 0 deletions