| commit | b431a198ec255be7efb30b4c81a779a4eb5009f6 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Tue Nov 18 02:05:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 18 02:05:21 2014 +0000 |
| tree | 736002359fa784c3a49d9574251a89090188f40b | |
| parent | cb82b7f1824dc7f9fa73c2bada7107c48290af8b [diff] | |
| parent | e6bc5adf2d4639b63001a5889ad301bae47bcd7f [diff] |
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.