tree 0ff67a78fcc3ddfd9853a1abbd99a8321cd07704
parent 90841a40051c0c46860c4996df2b1933a488e17b
parent de5b4f3c99b067eb4dcc4351c2bb931bd59b5864
author Jeff Sharkey <jsharkey@android.com> 1522121355 +0000
committer android-build-merger <android-build-merger@google.com> 1522121355 +0000

Merge "API council requested tweaks to SystemClock." into pi-dev am: 0bff5a6dfa
am: de5b4f3c99

Change-Id: Ic19a334c177c4eaeb3882479f6e5fcfb8644a0fb