tree d5089b229d82e127b53299c1002173efc89cd073
parent b34378a799504270eb8f3a66e44b18a738a8ff00
author Wink Saville <wink@google.com> 1342042525 -0700
committer Wink Saville <wink@google.com> 1342042525 -0700

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