Benedict Wong 0ee0b691f7 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: cd534c6990 am: 8caa274ade ...

am: 073572a677

Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe

2017-12-19 00:41:55 +00:00

..

java

Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: cd534c6990 am: 8caa274ade

2017-12-19 00:41:55 +00:00

jni

frameworks/base: use proper nativehelper headers

2017-07-19 10:06:40 -07:00