OSDN Git Service

am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual...
authorJeff Davidson <jpd@google.com>
Tue, 18 Nov 2014 02:05:21 +0000 (02:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Nov 2014 02:05:21 +0000 (02:05 +0000)
commitb431a198ec255be7efb30b4c81a779a4eb5009f6
tree736002359fa784c3a49d9574251a89090188f40b
parentcb82b7f1824dc7f9fa73c2bada7107c48290af8b
parente6bc5adf2d4639b63001a5889ad301bae47bcd7f
am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev

* commit 'e6bc5adf2d4639b63001a5889ad301bae47bcd7f':
  Enforce VPN control "permission" with an actual permission.
core/res/res/values/strings.xml