commit | d312550ff8a7cf8fd33698216634b296010daf31 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Thu Jan 06 14:09:31 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 06 14:09:31 2022 +0000 |
tree | bef955ded6042e9b702313940197e2f563e88b01 | |
parent | bbc431f3eaee29f83056f41ce5bd1ee936d89928 [diff] | |
parent | 08c51b04ca7a3a807ffbb07a3d9dc086eb4af5b6 [diff] |
Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533 Change-Id: I244779c19fab00eede1b7e9f3980679131e75cbb