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