tree ed451392598fa3209a45fc2dacb94434884e9415
parent 5612006f315d114139c02ba157cb5698cbbbc4ed
parent dcc5fa4d4f533d5675385146bf1ed6079f002f86
author Hridya Valsaraju <hridya@google.com> 1532725695 -0700
committer android-build-merger <android-build-merger@google.com> 1532725695 -0700

Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b
am: dcc5fa4d4f

Change-Id: I8e38cceea21c232e325f6f55681846696718e68e