diff options
author | Todd Kennedy <toddke@google.com> | 2018-08-17 12:56:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 12:56:57 -0700 |
commit | 644c277193f40d1523a668c3e30c43397b57fce4 (patch) | |
tree | e762964c83641e20fc98638d7b111e834eea98b0 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 7e646bf92238467be8ff88c28381783789640156 (diff) | |
parent | cc22fcc2959dd62572a8b5a84851134cea506014 (diff) |
[automerger skipped] Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev am: 5b78b0015e am: dff5d48b7e
am: cc22fcc295 -s ours
Change-Id: Ie86f686d9216e04ddd11fd75b1fb5fa8a25ab751
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions