OSDN Git Service

resolved conflicts for merge of d833cb54 to mnc-vt-dev
authorTyler Gunn <tgunn@google.com>
Mon, 31 Aug 2015 20:16:21 +0000 (13:16 -0700)
committerTyler Gunn <tgunn@google.com>
Mon, 31 Aug 2015 20:16:21 +0000 (13:16 -0700)
commitba2b21d2b52ee6dab40811c42df2743cceb52f66
tree5e8e46ba574858b2e4b2d11e49f4df41d166d007
parent1e5f0aaf6ebbc6e9dc6f41fea227c2fff4f46a3a
parentd833cb54537b81d49b6563afb7583d4b36e19c51
resolved conflicts for merge of d833cb54 to mnc-vt-dev

Change-Id: Ibd74014f660e0e6c6bdab2a01a35a81733359b86
telephony/java/android/telephony/CarrierConfigManager.java