diff options
| author | 2023-08-28 22:49:41 +0000 | |
|---|---|---|
| committer | 2023-08-28 22:49:41 +0000 | |
| commit | 627f35dbfd5c83af8ba1a7a150f88a010fb1a275 (patch) | |
| tree | 1dc5e258db52304c027f392f49d45c0f83577a49 /libs/androidfw/ResourceUtils.cpp | |
| parent | 6e5332ed3bcb8626862c95831bc7ca8987f044dd (diff) | |
| parent | 4a80d349099749c1401fb8e5c3bf3deec1d22f49 (diff) | |
[automerger skipped] Merge "Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2 am: edd48b50ae" into udc-d1-dev-plus-aosp am: 4a80d34909 -s ours
am skip reason: Merged-In I98d96bf72cbe09895b644a5a53f86499bf74bfab with SHA-1 6194a27664 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24499883
Change-Id: Id12f88643f28ff44772c05be03262e203160f449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions