tree 6312e0d954fc5e01ce63df84ac6f42486be83e65
parent 4c60b113b104a89c7c46e112b9fed7da6002e92c
parent 843c0bbb01420d08a41b783fd029af173f615ab0
author Nick Desaulniers <ndesaulniers@google.com> 1570811351 -0700
committer android-build-merger <android-build-merger@google.com> 1570811351 -0700

Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830
am: 843c0bbb01

Change-Id: I334bf1fd597e062896788443afb2455edc751bc6