Chalard Jean bbb7768f4f Merge "Add some useful helpers and constants." am: ed8d236319 am: 0f4421873e ...

am: 06d401ae73

Change-Id: Iaf611b8e39080d677c9cfe7edb124c11bbdf8a81

2017-10-06 10:11:04 +00:00

..

android/net

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

2017-10-04 20:53:04 +00:00

com/android

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

2017-10-06 10:11:04 +00:00