tree ea0e7c2c968d5399b252c6e08e4c00923ac2cce5
parent 10db3854bb1ea79f1a165b178b78f380e93a944b
parent 0d9e379cd682844ab3ae2b10c1b715bd164aa2fd
author Mark Salyzyn <salyzyn@google.com> 1539286226 -0700
committer android-build-merger <android-build-merger@google.com> 1539286226 -0700

Merge "recovery: deprecate check for ro.build.system_root_image" am: a67e9424c3 am: 9320e18f5d
am: 0d9e379cd6

Change-Id: Ie7260bca94dd39ffd8fb41214767eb702b93cb22