OSDN Git Service

Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev am: b42205ee9e
authorYipeng Cao <tccyp@google.com>
Thu, 18 May 2017 19:45:29 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 19:45:29 +0000 (19:45 +0000)
commitaf394724f055a09334de17eee0be84db8d7f5011
treec1d08849777025faefbb2d0cb98fdcfca4718cde
parent609aaf52dcc18eba8df53b900499cbf0e12ea65b
parentad17fd8fda65005554d73f8e7590090f80005279
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev am: b42205ee9e
am: ad17fd8fda  -s ours

Change-Id: I1481aed438cc531a304acad6e50893ba74c67a35