commit | 30ddc724a0a14b6f78c95a13637ec040c3322363 | [log] [tgz] |
---|---|---|
author | Jeff Davidson <jpd@google.com> | Mon Nov 24 21:19:55 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 24 21:19:56 2014 +0000 |
tree | 7589dee744e48cf607aad3be94ddf323037c3d24 | |
parent | b5f79d66f0f2cd6b24fb1bce4f0f9046bf9e98ef [diff] | |
parent | ca3d8edfba3697e84d6227ee1e964a42ec6e0d5f [diff] |
Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev