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