diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-11 08:50:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 08:50:05 +0000 |
| commit | 535809ab83f0f57ddf3dba7429f2513d8d943ce3 (patch) | |
| tree | c2e11e28f925cd4c8ee545635f61537995905528 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2d6063b63c786a87179b7822cc17c56581fa79b1 (diff) | |
| parent | 1d053b868f9ab3d934956c59c33c7b4bb82ba589 (diff) | |
am 1d053b86: am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '1d053b868f9ab3d934956c59c33c7b4bb82ba589':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions