tree d05790482eeddaebbc06a8644ae9630a317f7c1d
parent 8fa168d64df74acac0c8e402c82015dd61920eb9
parent 22ed1a7a79994aa4c0bed4ab87b065cc60b4f160
author Neil Fuller <nfuller@google.com> 1638889555 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638889555 +0000

Merge "Use ISO 8601 format for LocalLog local timestamps" am: 172fd44b2f am: 22ed1a7a79

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

Change-Id: I918da367c15a2ba74fac065482f271f536ef982e