resolved conflicts for merge of 4eede890 to jb-mr2-dev
authorJake Hamby <jhamby@google.com>
Tue, 26 Mar 2013 01:11:03 +0000 (18:11 -0700)
committerJake Hamby <jhamby@google.com>
Tue, 26 Mar 2013 01:11:03 +0000 (18:11 -0700)
commit4e9ed0410d72180872d59b14cb375c1c2ed94788
tree45e84dc72028f693bc73f699e024bd433a8061bf
parent1b21c4e9ebaba1af72ae6fa18e98d6863c888aca
parent4eede89017a05b8180835d61632af312a9573a5f
resolved conflicts for merge of 4eede890 to jb-mr2-dev

Change-Id: I7ee1d93d832275ad04d4e6bbae68d22ae86322ac
src/java/com/android/internal/telephony/IntRangeManager.java