diff options
| author | Xin Li <delphij@google.com> | 2019-09-11 15:58:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-11 15:58:11 -0700 |
| commit | 200f82d52540dfb52243165b5deeb2f82c8dae3e (patch) | |
| tree | 74361f3de6481b534bbbf6b390770d18e0fe1c8e /bootctrl/BootControlShared.cpp | |
| parent | 8e1655c0dd7dd7c262e936505b3e710279e818de (diff) | |
| parent | e0400f8cbf1e02d99934cc6e5e12df3931610405 (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 skip reason: change_id Ib2a641d71ae0cd7049433d69f72cb666d236886b with SHA1 d78e8f1465 is in history
Change-Id: I84c1c69e75511eb4b56c6ab3a24673f87180f73e
Diffstat (limited to 'bootctrl/BootControlShared.cpp')
0 files changed, 0 insertions, 0 deletions