tree b6718477f524d19538eb72066aaf21d428f9b032
parent 5226bbb5a61046c90f2f1a14919d1f2ba3a460ad
parent 2bc66bf601081928fb46e2727ec6d825f128bf26
author Joe LaPenna <jlapenna@google.com> 1481578470 +0000
committer android-build-merger <android-build-merger@google.com> 1481578470 +0000

Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395
am: 2bc66bf601

Change-Id: Idaa23641c8e95890271c554dee0244702601a109