tree 0ac86ea69d5e88e27bb6a6e0386bd47d00c7d624
parent 2b86731b42e8ef8cec147e2c7f34c85c3b16190f
parent f0031bf3533c8f130130337ae9b4266711f432b4
author Anton Hansson <hansson@google.com> 1597752741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597752741 +0000

Merge "Make framework-res dep in stubs explicit" am: f0031bf353

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

Change-Id: Icad8a2244e01edd32dc1512e9b3f3aaacaf55d57