OSDN Git Service

Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
authorLorenzo Colitti <lorenzo@google.com>
Thu, 22 Oct 2015 06:18:43 +0000 (06:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Oct 2015 06:18:43 +0000 (06:18 +0000)
commitbdc458048abee78a945a26cd13a71245e7d4a2e5
treeed8307d9baff85ff504ab69759e46d83b3e3ef8f
parent64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec
parent809dcade9906001f6aa51a68aa783e20bb1d7c0d
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am: 809dcade99

* commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
core/java/android/provider/Settings.java
core/res/AndroidManifest.xml