tree 9852c72be3ffb3cc1440afb92aab33e78c40eae5
parent 9a4f58b8d5e91c609c40414b0f140062260b7eee
parent c7a2225665cb17dd9978b013f9cd5ebef6dd1879
author Treehugger Robot <treehugger-gerrit@google.com> 1596850649 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596850649 +0000

Merge "Add uptimeNanos to SystemClock" am: 52c8422ea1 am: c7a2225665

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1394287

Change-Id: I8dd8c3e148a011b250260a2ebc329fdeb06433a6