resolved conflicts for merge of 6125afc3 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 11 Jan 2013 18:21:46 +0000 (10:21 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 11 Jan 2013 18:21:46 +0000 (10:21 -0800)
commit98cd16eb902d714d6eb981528408d2a5b779e353
treeaafb450b4de1275fa2000768067b04c5abddcab6
parent8750dac3bd5f9d1a6f5222f3dc9e46ee154843eb
parent6125afc391426c25d6321a31635cf1909aefb3bd
resolved conflicts for merge of 6125afc3 to master

Change-Id: I40f57858d775b91c409532d19ea5c98ec51afb22
src/java/com/android/internal/telephony/RIL.java