tree 1615034ba804fe3f6777a81817391f33930b9ab0
parent 865643a12dbc491818be219936cdb255ea04ff5d
parent 4b57d15fa33be9f15285a3fd461227bd91a0db1f
author Anton Hansson <hansson@google.com> 1597765384 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597765384 +0000

Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp am: b1db8662c0 am: 4b57d15fa3

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

Change-Id: I1da42b6e56e24a5b8525b341fda623a76a2624c0