| commit | ab1eed7f6f88bb8d4f08f2ac797a482bd8749982 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Sat Jun 04 04:33:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jun 04 04:33:19 2016 +0000 |
| tree | 4791c34bde2602501d9d6d988c9b148587cb2afa | |
| parent | 8e7a862eac1c36b7a5808ca25435e4325e832d99 [diff] | |
| parent | df956eceefb6bf7addc0057572741237cacdfa12 [diff] |
resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp am: df956eceef * commit 'df956eceefb6bf7addc0057572741237cacdfa12': recovery: Add support to brick a device. Change-Id: Ib918b66e3ba07f09da34781cc36307acac0a23e7