diff options
author | Erik Kline <ek@google.com> | 2015-10-14 18:01:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-14 18:01:48 +0000 |
commit | 12ff46df1af8bd252c3973351cd52be178b415c4 (patch) | |
tree | 99118e43f0eeef3bc1a5e65be2530ea702a233f6 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | e95ce0fdb7f94b7e795efd9fd269c47caed8d570 (diff) | |
parent | 51eb6e149581f04802784f972dfc3794a64a1788 (diff) |
am 51eb6e14: am 9c8abd1d: am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev
* commit '51eb6e149581f04802784f972dfc3794a64a1788':
Don't crash if an invalid always-on VPN profile is configured.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions