tree 669ffdd050bee3b2eedbc8c10a2a9cba8ba8c4fc
parent 2f1e9b45a8e29999d94afb249c97a3c301ca1e0e
parent cb53e78f5634b5e46d18f23798a84457f1b5dcf1
author Junyu Lai <junyulai@google.com> 1546619444 -0800
committer android-build-merger <android-build-merger@google.com> 1546619444 -0800

Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585
am: cb53e78f56

Change-Id: I0f289ce46462f494adb99628bd504cafb584eeeb