tree 0dbff96ea9bb4ee7e9b287407f77a1e7ad8e4acb
parent 68fe0be25e277668ebd60a034dd46e3be6f3a837
parent ba33da288418387234637c6806e103936530cb53
author Tao Bao <tbao@google.com> 1464994514 +0000
committer android-build-merger <android-build-merger@google.com> 1464994514 +0000

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

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

Change-Id: I44c667f8eb0d003a9cc84ea457f91b44263af7df