tree c3937a78321bc572fcc2c6a95f23e0806cc3e968
parent bebe94b105869c8c745965f0f3f5c3fcf13d1813
parent d93f541679534f40ff8758d1abc30f3b0dd7758a
author Tianjie Xu <xunchang@google.com> 1471472232 +0000
committer android-build-merger <android-build-merger@google.com> 1471472232 +0000

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

Change-Id: I4832afe30fb536bcb8cc043c5c04a2f521ac1136