Hugo Benichi 4cf199383f Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." ...

am: 704520c392

Change-Id: Ia0ae78f8406b81377491407cf5ef8ca339952def

2017-03-06 12:30:05 +00:00

..

java

Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499."

2017-03-06 12:30:05 +00:00

jni

Merge "Make seccomp honor setenforce"

2017-03-04 02:17:43 +00:00

res

Merge "Add DUN to networkAttributes"

2017-03-01 19:35:52 +00:00

tests

Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2

2017-02-17 22:25:53 +00:00