Merge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059 am: 35a9183f59

author Dan Willemsen <dwillemsen@google.com>

Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)

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

Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)
author Dan Willemsen <dwillemsen@google.com>
Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)
diff --cc rild/Android.mk
Simple merge
diff --cc rild/rild.c
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)
		1	2
rild/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
rild/rild.c	patch \|	diff1 \|	diff2 \|	blob \| history