Merge "rename callingPackageResourceId to resourceIdInCallingPackage" into tm-dev am: 8084c8c036 am: 8b4cd4b86a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16976028 Change-Id: Ie555aa612949e3635010dacb5284bc152cc2ea6f
This commit is contained in: