Chalard Jean 6b2fa02346 Merge "Add some useful helpers and constants." am: ed8d236319 am: 0f4421873e am: 06d401ae73 ...

am: bbb7768f4f

Change-Id: I9bebe24f2c65ecaf31b70e02a45e0acd50e1430e

2017-10-06 10:21:43 +00:00

..

android/net

Merge changes from topic "ipsec-svc-cleanup" am: 9778c7884f am: ae61e0c6e8 am: 4e793fd0b5

2017-10-04 21:14:17 +00:00

com/android

Merge "Add some useful helpers and constants." am: ed8d236319 am: 0f4421873e am: 06d401ae73

2017-10-06 10:21:43 +00:00