diff options
author | Kevin Cernekee <cernekee@google.com> | 2015-10-20 22:36:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 22:36:49 +0000 |
commit | a3625076e58bbcf4909a9c17ce18948020e65ac3 (patch) | |
tree | 2f234710e32a7583ba363f9ab860551ee7b88058 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4e18ec7343ff91f0112dc0fedab6ea720857a6f5 (diff) | |
parent | d166333eb5d3886a18a3a951d833a6d01cb8340d (diff) |
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0
am: d166333eb5
* commit 'd166333eb5d3886a18a3a951d833a6d01cb8340d':
ignore initial request to disable iptable chain
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions