tree 653f52a0fa2e2cedf302c6cafffbe22d52fddf41
parent d7865e81f139cf71894c60d92e7442fb3433fdfe
parent 4e4474c9c596e1feda81a97e7c4e95b5d2e68467
author Tianjie Xu <xunchang@google.com> 1471471812 +0000
committer android-build-merger <android-build-merger@google.com> 1471471812 +0000

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

Change-Id: Iaca861be960a271c09c07deeaf4f98850edc4f71