OSDN Git Service

Merge "Lock down networking when waiting for always-on" into nyc-dev
authorRobin Lee <rgl@google.com>
Wed, 18 May 2016 23:42:40 +0000 (23:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 May 2016 23:42:40 +0000 (23:42 +0000)
commit43fbfbf94c5b8ae4353b73c36d85ff02fd36fc67
tree2fbea6bba51db7d7e0c38ce1ae65d7fc7c2f5bfb
parentd2d8e9b22830a07d12f1542a5dc9476a3ab3d7bb
parentd171df660e19bdba4d188beeb8b6023874712413
Merge "Lock down networking when waiting for always-on" into nyc-dev
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I34fffb119eecef0052be673f307ef63c94fc58ee
core/java/android/provider/Settings.java