tree 1e8903709d97935081b5a66e5eea096efa20f765
parent 63e4cc1d1613ba958fe0b550d0392b6d46058f26
parent e254b4e9e4ac843e3e2ac9c81b600b7f8d024a0b
author Tianjie Xu <xunchang@google.com> 1471471992 +0000
committer android-build-merger <android-build-merger@google.com> 1471471992 +0000

Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5
am: e254b4e9e4

Change-Id: Iedaed39a62f9756c0dc8122a40ea7db2c21f1c30