tree b7be612c73a4b0c1ae06194ffef132e1cff6b9e5
parent 1c35b48253f8caba7df1f2ba7dbafc1113010a6e
parent c33d037d7df5abd7f15792ec9d303d94d1fc09fc
author Tao Bao <tbao@google.com> 1485967498 +0000
committer android-build-merger <android-build-merger@google.com> 1485967498 +0000

Merge "Fix a log issue in ui.cpp." am: 7f38fbf976
am: c33d037d7d

Change-Id: I440288d7d518e9aa6cb13fe7d8647770bc7011f3