| commit | 3c6bc9b14d8dff7d8fa6f4c0a99266d92981f07f | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Jan 04 08:30:44 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 04 08:30:44 2019 -0800 |
| tree | 669ffdd050bee3b2eedbc8c10a2a9cba8ba8c4fc | |
| parent | 2f1e9b45a8e29999d94afb249c97a3c301ca1e0e [diff] | |
| parent | cb53e78f5634b5e46d18f23798a84457f1b5dcf1 [diff] |
Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585 am: cb53e78f56 Change-Id: I0f289ce46462f494adb99628bd504cafb584eeeb