Merge "Move rild to vendor partition." am: 1d8bd8a581 am: 85e7756508

author Amit Mahajan <amitmahajan@google.com>

Fri, 24 Feb 2017 01:52:54 +0000 (01:52 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 24 Feb 2017 01:52:54 +0000 (01:52 +0000)
author Amit Mahajan <amitmahajan@google.com>
Fri, 24 Feb 2017 01:52:54 +0000 (01:52 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 24 Feb 2017 01:52:54 +0000 (01:52 +0000)
diff --cc rild/Android.mk
Simple merge
diff --cc rild/rild.rc
Simple merge
author	Amit Mahajan <amitmahajan@google.com>
	Fri, 24 Feb 2017 01:52:54 +0000 (01:52 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 24 Feb 2017 01:52:54 +0000 (01:52 +0000)
		1	2
rild/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
rild/rild.rc	patch \|	diff1 \|	diff2 \|	blob \| history