Merge "Move RCS APIs to android.telephony.ims"

author Sahin Caliskan <sahinc@google.com>

Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)
author Sahin Caliskan <sahinc@google.com>
Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)
diff --cc Android.bp
Simple merge
diff --cc core/java/android/content/Context.java
Simple merge
author	Sahin Caliskan <sahinc@google.com>
	Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history