tree a55c0fadc9355ec2b1474aa70cce776f8eead77f
parent a3b8ce8b39e87aac60f89ab9e22e418ef8d25252
parent 8dc190990154e8fff483084e4b44a1fdce507f0f
author Tao Bao <tbao@google.com> 1464994684 +0000
committer android-build-merger <android-build-merger@google.com> 1464994684 +0000

resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884
am: 8dc1909901

* commit '8dc190990154e8fff483084e4b44a1fdce507f0f':
  recovery: Add support to brick a device.

Change-Id: I314215e1230d0167b27602c387df517e244b7455