diff options
| author | Xin Li <delphij@google.com> | 2019-10-26 22:07:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-26 22:07:11 -0700 |
| commit | c35ab8b853d46c95272853036431c242562dbe58 (patch) | |
| tree | eb55779e2c2591ed725bd05df31fd10c4e7e2ea9 /bootctrl/BootControlShared.cpp | |
| parent | 8da0f9fe3583594e2c1b71ed32f5ce4124a737fa (diff) | |
| parent | 594222da36b04029af23c7b0fb4379365fc9b8c2 (diff) | |
[automerger skipped] Merge Coral/Flame into AOSP master
am: 594222da36 -s ours
am skip reason: change_id I6962cbdb67115d8c4208716ce3e7fc2602e6d0c9 with SHA1 8da0f9fe35 is in history
Change-Id: I4d3d765636a8906ba2fa6ab6349afc546c0892fe
Diffstat (limited to 'bootctrl/BootControlShared.cpp')
0 files changed, 0 insertions, 0 deletions