Skip to content
Commit 9b346579 authored by Wink Saville's avatar Wink Saville
Browse files

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
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment