[automerger skipped] [RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution." am: a1409eda1b am: 9bb9222f35 -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: I10a576837401850fb6fabb3ce49e5dee6da13825
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:46:17 +00:00

committed by Automerger Merge Worker

parent 92f14228aa 9bb9222f35

commit f67926a7e0

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