tree ed451392598fa3209a45fc2dacb94434884e9415
parent 2a047b9ff379dd8859cad960c2cf2a3d88ae67e0
parent ed2480be9b82f87283ee80714771d664093ec69e
author Hridya Valsaraju <hridya@google.com> 1532724509 -0700
committer android-build-merger <android-build-merger@google.com> 1532724509 -0700

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

Change-Id: I91dadd30c1a96be668a5e3f295aa3f039f44d494