tree 2303c23747d2bd656ce7656959088efe8ed5b840
parent f685344bb29efa91e083ef4f3d9d371518e1fe9c
parent 98af818d035649ad84870f9bca21405ad945204a
author Yipeng Cao <tccyp@google.com> 1495450646 +0000
committer android-build-merger <android-build-merger@google.com> 1495450646 +0000

Merge "Revert the system clock in the debug oc-dev" into oc-dev am: 4229cb80a0
am: 98af818d03

Change-Id: Id7aacffd3fa48d76003840fff8f4d48197eae936