[automerger skipped] Merge "Setting callingAttributionSource in getType and getStreamType" into udc-dev am: 9b39adf62e am: a15c4a0cf0 -s ours
am skip reason: Merged-In I31d6c7e9786ad187a92a02e707180410a3c875d6 with SHA-1 9990ae6ba7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22167059
Change-Id: I8d78b789fe1e0af32c342921f45090fbc9a8ae98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
fb50f95074