| commit | 864ead76b14f2ac5c38f3beb48bd832c129aeeb5 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Jan 04 08:47:41 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 04 08:47:41 2019 -0800 |
| tree | 313c4b6487a2d04ae4edf56af133277c654b72be | |
| parent | 968285a043cc63f55f41637a530cb1d095a9a335 [diff] | |
| parent | 3c6bc9b14d8dff7d8fa6f4c0a99266d92981f07f [diff] |
Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585 am: cb53e78f56 am: 3c6bc9b14d Change-Id: I1ac85ac863026ea99117c5b0115bcc0c9144fb7b