tree 13be14fc3ccfd8ffeac54eb250e5753fea28aa94
parent 0471a2975a0aba45b45f02aea499773d15e32d49
parent 4229cb80a0302aa8e2503a6b7945747bbfc6ce3b
author Yipeng Cao <tccyp@google.com> 1495450048 +0000
committer android-build-merger <android-build-merger@google.com> 1495450048 +0000

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

Change-Id: Icef2e7fb527f90a44839b3f1a2f931760b6696b2