From: Billy Lau <billylau@google.com>
Date: Fri, 7 Aug 2015 22:42:55 +0000 (+0000)
Subject: am 16dc289d: am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_... 
X-Git-Tag: android-x86-7.1-r1~1235^2~310
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c2012bb4;p=android-x86%2Fpackages-apps-Settings.git

am 16dc289d: am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '16dc289d5b29ecccf02fc86349ab53cbc10e6b11':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
---

c2012bb4792299d16ea1c55c40ad18cdfad9a134