tree f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7
parent ad539282a149c1a28517a03c0a32cefd8727f210
parent b7ccc7acc3b9ee78922bdeae06c5bd8f9d7cbcbc
author Pete Bentley <prb@google.com> 1600263951 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600263951 +0000

[automerger skipped] Make System.nanoTime and currentTimeMillis CriticalNative. am: 63fafb1fc5 am: 9c36c92223 am: b7ccc7acc3 -s ours

am skip reason: Change-Id I4909fcd6f3af09a03ee6388ea58b92826b4bbfbc with SHA-1 63fafb1fc5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/11078199

Change-Id: I6de1a316dba90c48a0a5d6b4afeed9ee31a49841