tree 5c10fffd30287c3b0e319ff8b5f7ba9b8a0620f7
parent e23a6745d0da53b0f22842c14fc7e9b21e07cda1
parent 0718e9f3de379164a11a87fe7f16e00f790163d3
author Anton Hansson <hansson@google.com> 1602874876 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602874876 +0000

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

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

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

Change-Id: Ic5efbcbfdcea80588b9e1170763abc92c1624bdc