tree 4b98585dc687eb6e9a78c468f1737c32bbe493cb
parent cf9248cbf5461c8bf2fbae544c96bd0b5e7b5e02
parent 2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4
author Junda Liu <junda@google.com> 1415754840 +0000
committer android-build-merger <android-build-merger@google.com> 1415754840 +0000

Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev
automerge: 2eb5a5f

* commit '2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.