aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-08-25 15:46:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-25 15:46:44 +0000
commit49bd6250d15bbf59c842c7928be747e4d71e28d3 (patch)
tree0c636a2f03b0c85331f17df8e215cae98306532a
parentbc3524e9571ef3186280027040034b58d02e959d (diff)
parent8e8de490462cef4470f63c448a19ba314bf31690 (diff)
downloadiptables-49bd6250d15bbf59c842c7928be747e4d71e28d3.tar.gz
[automerger skipped] use __BIONIC__ not __ANDROID__ am: 48f5cbdd1c am: d268367c34 am: 8e8de49046 -s ours
am skip reason: Change-Id Iec8088a51b471a8b10a28c0ac8c4badf60bbbe5f with SHA-1 48f5cbdd1c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/11447560 Change-Id: I04fed3399dcb85fe451efba98ca59c1b9c15846e
0 files changed, 0 insertions, 0 deletions