Merge "Add simplified_network_settings_bool to CarrierConfig."

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 22 Dec 2016 20:01:56 +0000 (20:01 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 22 Dec 2016 20:01:57 +0000 (20:01 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 22 Dec 2016 20:01:56 +0000 (20:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 22 Dec 2016 20:01:57 +0000 (20:01 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 22 Dec 2016 20:01:56 +0000 (20:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 22 Dec 2016 20:01:57 +0000 (20:01 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history