[automerger skipped] Make framework-res dep in stubs explicit am: 47994f3743 am: dda67dc7d9 am: df2baa74e1 -s ours

Browse Source

am skip reason: Change-Id I1829789af207cc45c49c0c68369fc7c0c085bcb0 with SHA-1 47994f3743 is in history

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

Change-Id: I86c6ea9da38b843675b0c91fad94b242a9a461b7

...

This commit is contained in:

Anton Hansson

2020-10-16 18:48:33 +00:00

committed by Automerger Merge Worker

parent 0718e9f3de df2baa74e1

commit 2b6ad7eb35

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