[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."" into udc-dev am: b4f8ee63e2 -s ours am: 710d83c54c -s ours

Browse Source

am skip reason: Merged-In Ie6fb138edd20f02246ff2d3924497b1369d762f5 with SHA-1 a1409eda1b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22791083

Change-Id: Iecf07350b017616d03a5e44559931e74e1713d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Alex Buynytskyy

2023-04-24 16:48:13 +00:00

committed by Automerger Merge Worker

parent f67926a7e0 710d83c54c

commit d3e5b92d7a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available