tree 345f11572dfd3af6384cda5cbcd425d742f78204
parent 29ef12f777849843f16226b5f1a6cbc149d0c6c8
parent 7f38fbf976bd9fb145925a803af49410fa43a8a6
author Tao Bao <tbao@google.com> 1485967378 +0000
committer android-build-merger <android-build-merger@google.com> 1485967378 +0000

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

Change-Id: I84dcdabf341eb566ee7591259c405ac7d406ebf0