diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-11 08:38:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 08:38:35 +0000 |
| commit | e4be48e0853bcde90d738031433271c5e41bd5e2 (patch) | |
| tree | 05aa618453ea914fe28a8616491ff040c1b07cdf /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0f0e93dc702e97644bacceb7ac08552672a8151d (diff) | |
| parent | 46dbb5be4c56e8af603514a3cf2bd7daf0191724 (diff) | |
am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
automerge: 46dbb5b
* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions