tree aca1022d82f29f073bda729b08a293ccb3ac1563
parent 78c47e7f02b9b062e8b72372c29a88a8a06b6d51
parent cd00582000ef8122eb521b254dfb77ec44cce75d
author Jiyong Park <jiyong@google.com> 1504805879 +0000
committer android-build-merger <android-build-merger@google.com> 1504805879 +0000

Merge changes from topic "hide_log_time" into oc-mr1-dev
am: cd00582000

Change-Id: I28004046f32523b4445cce9036c7170fc3a52f37