diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-11 08:25:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-11 08:25:27 +0000 |
| commit | 50996a12a8e859346d5eb3c4569c4e81c9b52a05 (patch) | |
| tree | ee718a236ef383ecb3f68cb450b73997195d0800 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4 (diff) | |
| parent | b21298a686b04d55ff97223dd317497845713f4b (diff) | |
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions