tree bae13d51750ea157941def378f5552d89433abd6
parent 0385e3e908fb9988bb2d2d0d15e32cb6a819b34e
parent 99271a3995e35c64105b2778f695ca6dd716a3f2
author Billy Lau <billylau@google.com> 1438987792 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438987792 +0000

am 99271a39: am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '99271a3995e35c64105b2778f695ca6dd716a3f2':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS