tree 6b2fb772a853fedd4d1e8984ae880044d3e254b7
parent ea4dfd2f0d909f799b71cbec3900daf8b84a50d2
parent 1ccb872a9e17b565609091408cb37314442fccb0
author Wei Wang <wvw@google.com> 1477592345 +0000
committer android-build-merger <android-build-merger@google.com> 1477592345 +0000

Merge "TextOutput log improvement" am: 3e9e757437
am: 1ccb872a9e

Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb