diff options
author | Adam Powell <adamp@google.com> | 2013-10-16 01:41:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-16 01:41:22 +0000 |
commit | 49b6d38fe7308d4641046af4a2d062cdc6033c30 (patch) | |
tree | 8ba3fdaf3189ebfce5f5c0d428e239b3e452c7c4 /services/jni/com_android_server_connectivity_Vpn.cpp | |
parent | 905c50a21238aa1de38989f1f9169cf40ebe02d5 (diff) | |
parent | bdb5ac7ddbabec0ba947a32937d8b95738d513dc (diff) | |
download | frameworks_base-49b6d38fe7308d4641046af4a2d062cdc6033c30.zip frameworks_base-49b6d38fe7308d4641046af4a2d062cdc6033c30.tar.gz frameworks_base-49b6d38fe7308d4641046af4a2d062cdc6033c30.tar.bz2 |
Merge "Fix dodgy states of keyguard transport controls" into klp-dev
Diffstat (limited to 'services/jni/com_android_server_connectivity_Vpn.cpp')
0 files changed, 0 insertions, 0 deletions