commit | e52f19716e87c052e723ebfcb437dfb6f6ff4431 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Thu Jan 06 14:39:15 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 06 14:39:15 2022 +0000 |
tree | 8b5c4f86b1e740e61f5cc399b7cf469f0230a519 | |
parent | ae17bc52fc14c15537dd64d00be74701754f5fef [diff] | |
parent | f23caacaf1e3fd20142cf8afcad192285028e187 [diff] |
Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca am: d312550ff8 am: f23caacaf1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533 Change-Id: I4ecebf6cc2c8c0eb69aa14164a19426947470eb8