resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp

Browse Source

am: df956eceef

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

Change-Id: Ib918b66e3ba07f09da34781cc36307acac0a23e7

...

This commit is contained in:

Tao Bao

2016-06-04 04:33:19 +00:00

committed by android-build-merger

parent 8e7a862eac df956eceef

commit ab1eed7f6f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available