OSDN Git Service

am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev
authorJonathan Basseri <misterikkit@google.com>
Fri, 19 Jun 2015 20:36:32 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jun 2015 20:36:32 +0000 (20:36 +0000)
commitc74b2cea5b666db373b85e3dc7f80ea01e106aad
tree788b16dc136ef4b4c555a212b8082303a1979fe9
parent8a8d41f0dbbfc74ab18af97625d6fbd65dffb9ac
parent48fb9d15ecaceedd5477b7b780f22b7663ca103f
am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev

* commit '48fb9d15ecaceedd5477b7b780f22b7663ca103f':
  Migrate 'csp_enabled' to CarrierConfigManager.
api/system-current.txt
telephony/java/android/telephony/CarrierConfigManager.java