Commit 9b346579 authored Jul 11, 2012 by Wink Saville

Add a blank line to MockRilTest.java

Create a merge conflict on the first change to be submitted for moving
telephony and mms from frameworks/base to frameworks/opt. I'm doing this
by adding a blank line to a file in master that will be deleted in
frameworks/base in jb-dev-plus-aosp.

We can then manually merge all of the changes across the projects and
minimize the time master might be broken.

Change-Id: Ie55db5037dbfd20ea6b4be430f65b93250203a63

parent b34378a7

telephony/tests/telephonytests/src/com/android/internal/telephony/mockril/MockRilTest.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/


	package com.android.internal.telephony.mockril;		package com.android.internal.telephony.mockril;

	import android.util.Log;		import android.util.Log;