[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."" into udc-dev am: b4f8ee63e2 -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: If7e1c28029c3d4bb53a385a757195863c0b2947d
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:14:27 +00:00

committed by Automerger Merge Worker

parent 9bb9222f35 b4f8ee63e2

commit 710d83c54c

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