diff options
| author | Xin Li <delphij@google.com> | 2019-10-26 22:36:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-26 22:36:31 -0700 |
| commit | ae066a0ed677416dcd3605091159b7daff4bcff2 (patch) | |
| tree | ed1a825b76f4572b89ea822492452b396f16b5cb /bootctrl/BootControlShared.cpp | |
| parent | 65e9a6e1b76f0475a1b6be526f6fcf94ef14ecd7 (diff) | |
| parent | 59be345221a6722e3226261a2a4da0f649914e42 (diff) | |
[automerger skipped] Merge Coral/Flame into AOSP master am: 594222da36 -s ours am: c35ab8b853 -s ours am: 8dc8fb809d -s ours
am: 59be345221 -s ours
am skip reason: change_id I6962cbdb67115d8c4208716ce3e7fc2602e6d0c9 with SHA1 8da0f9fe35 is in history
Change-Id: I9275118c70fddcc3a3dbc8bb3f26f641ee565170
Diffstat (limited to 'bootctrl/BootControlShared.cpp')
0 files changed, 0 insertions, 0 deletions