nharold ffb9ae2323 Merge "Cosmetic Cleanups for IpSecService" ...

am: 87d6fc04b2

Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8

2017-10-05 00:44:37 +00:00

..

java

Merge "Cosmetic Cleanups for IpSecService"

2017-10-05 00:44:37 +00:00

jni

frameworks/base: use proper nativehelper headers

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