summaryrefslogtreecommitdiff
path: root/tools/aapt2/ManifestParser.cpp
diff options
context:
space:
mode:
author Erik Kline <ek@google.com> 2015-10-14 17:48:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-14 17:48:48 +0000
commit9c8abd1d7ab205047a7e0f131eca24b2f3019d5d (patch)
tree22fb738d7e643502819e12613be0082ef49b0f5a /tools/aapt2/ManifestParser.cpp
parent62679a1f6d04a554e452b5126ccb784c3870a035 (diff)
parentf23eece2006f04785fa1b873afc66f01bb238e0b (diff)
am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev
* commit 'f23eece2006f04785fa1b873afc66f01bb238e0b': Don't crash if an invalid always-on VPN profile is configured.
Diffstat (limited to 'tools/aapt2/ManifestParser.cpp')
0 files changed, 0 insertions, 0 deletions