tree b7be612c73a4b0c1ae06194ffef132e1cff6b9e5
parent e4cf63be78225a54c86cd92f1a2a35b052ea6b37
parent 2be767eba4a8ce0433ff75431918f540cfe8181d
author Tao Bao <tbao@google.com> 1485967648 +0000
committer android-build-merger <android-build-merger@google.com> 1485967648 +0000

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

Change-Id: Id0b175413d92e994fb18c0b93bdfd20a02843e6c