diff options
| author | Jeff Davidson <jpd@google.com> | 2014-11-24 21:19:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-24 21:19:56 +0000 |
| commit | 6ea4e11d9817d85eb5c0ff445154985e4eb0c534 (patch) | |
| tree | 2318ca4568612cf73ddfeeeb869793c4f0492d0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 51cb7aa774cf6ab7727928d136052c61325a8031 (diff) | |
| parent | 11008a78b8e30910cedd8b8431980c7738183292 (diff) | |
Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions