tree ed451392598fa3209a45fc2dacb94434884e9415
parent 6c086c4009a6b8a42ca548379fceb0304877602c
parent 1010f723c6260cb584e26759ad5d973e04375f29
author Hridya Valsaraju <hridya@google.com> 1532726690 -0700
committer android-build-merger <android-build-merger@google.com> 1532726690 -0700

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

Change-Id: Icb130e02e5ec4d05af3ff5270efdb984af4613fd