diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 13:48:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-05 13:48:54 -0700 |
| commit | fe09665162907f98f6a9a9ec276cc4cce2f4a65f (patch) | |
| tree | 83e05602b5348fe63fc48a5112ed27916622c87c /bootctrl/LegacyBootControl.cpp | |
| parent | b626ca1cde9b9577c920e92fe0558c273ad78672 (diff) | |
| parent | b840808cffe7deb96111556bebd8e5ea3aeb218f (diff) | |
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d78e8f1465 -s ours am: 0f63e83ece am: 6c9fe3a56d
am: b840808cff -s ours
am skip reason: subject contains skip directive
Change-Id: I1a8d37d53bff49c739ca7d4546df2ea8fda8b8d8
Diffstat (limited to 'bootctrl/LegacyBootControl.cpp')
0 files changed, 0 insertions, 0 deletions