tree 79197c657da8d254052f0d27e0b811cbf464c7f5
parent 1e48ea5c6ce5ca4c6545ee25f8d7c4fcb7233293
parent 02eebf4399f29c0a57cc5fe010448c948ff6c3ef
author Neil Fuller <nfuller@google.com> 1645637265 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645637265 +0000

[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 am: 02eebf4399 -s ours

am skip reason: Merged-In Ic477c021529a94b4a3665426b7daaf6567fa311a with SHA-1 115132dbaa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1979487

Change-Id: I9b48b3137bcd1117b9acf483edb4591e72b6d2e9