OSDN Git Service

Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
authorNicolas Prevot <nprevot@google.com>
Tue, 26 May 2015 20:39:27 +0000 (20:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 May 2015 20:39:28 +0000 (20:39 +0000)
commit5e0ef0d0e62b77bcfc687bfbc1db875db71eba69
tree11df943849d2c4758d45f8e559b504d6aded872b
parentcf3c8af6c5dbdd7c0c7c019fe10ca21c9c2369cc
parent298f98fa234f353267ddc9c75d58e8cc542c25f1
Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
core/java/android/os/UserManager.java