| commit | d2a878424d5c418e168e5d42d37a160fa55b86ae | [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 | 0841ef2dc6b13ca6ab4163a6d44ecda6814825f5 | |
| parent | 47d06bafbc8f3892c5be0ba1e7516feac118d1c6 [diff] | |
| parent | 89d088026422184ce77add85cdd576b372815d59 [diff] |
Merge changes from topics "ms34-tm", "ms40-clock" am: a3c2578644 am: 89d0880264 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533 Change-Id: I244779c19fab00eede1b7e9f3980679131e75cbb