Chalard Jean 467d8f991e Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a am: 11c58491ff ...

am: c8a38238fe

Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69

2019-01-21 11:28:55 -08:00

..

java

Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a am: 11c58491ff

2019-01-21 11:28:55 -08:00

res/raw

Ignore ipv6 tx traffic on clat uid.

2018-12-10 15:19:03 +08:00