diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 12:03:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-05 12:03:42 -0700 |
| commit | 0f63e83eceddd4877ba9ec5c1a758a0da25ef2ca (patch) | |
| tree | 5914eb1ca87120aaaab08bc24d84bc4610616b71 /bootctrl/LegacyBootControl.cpp | |
| parent | edbd41a152d062d182e14c3908815aa8fdf12475 (diff) | |
| parent | d78e8f14658e351169bc7d26163248b38d50c2c1 (diff) | |
[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: d78e8f1465 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d8bc07bb922461fe4c10ee49213b68f80cb88c0
Diffstat (limited to 'bootctrl/LegacyBootControl.cpp')
0 files changed, 0 insertions, 0 deletions