tree 3a18cd0e70f619365c862bc4a6797d14ec08466b
parent 251e4283b175c1ad8c12c92528bec827ea24cdfe
parent b52989c736b3278f1ab5f6a9db8e555f40b99585
author Joe LaPenna <jlapenna@google.com> 1481578795 +0000
committer android-build-merger <android-build-merger@google.com> 1481578795 +0000

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

Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36