Merge "Added null check while fetching the context URI resource" into udc-dev am: 222f1e1ab6 am: 18aaacce4f am: abe5b29d51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23406924 Change-Id: I9fcfdd1bebe47d65cde7b0a57975b9084dedfcf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: