diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-14 22:19:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-14 22:19:17 +0000 |
| commit | 8d3090466bebca995f6ae31cef80530e229c3b57 (patch) | |
| tree | 1e898a52e76cc791888d1cd1a5aeba21a2c44dde /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0e06694e35d183da0a9e5d19c2aca87c03b26aeb (diff) | |
| parent | 51afc1d9de2a3a9e7d89b44a7f4009b3c2126213 (diff) | |
Merge "Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am: 488042fe3b am: c4ef7669a1" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions