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