commit | 89d088026422184ce77add85cdd576b372815d59 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Thu Jan 06 14:02:58 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 06 14:02:58 2022 +0000 |
tree | 0841ef2dc6b13ca6ab4163a6d44ecda6814825f5 | |
parent | ddc27f65721a24868f774a41ff518cba8c1aaa3a [diff] | |
parent | a3c2578644d3a05dcb0853ac6fc15ee3cdf6d57d [diff] |
Merge changes from topics "ms34-tm", "ms40-clock" am: a3c2578644 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533 Change-Id: I719edc4e4f98b0fdabb50736156551d3f8d35bd1