OSDN Git Service

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours...
authorSteven Moreland <smoreland@google.com>
Wed, 2 Aug 2017 23:56:20 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:56:20 +0000 (23:56 +0000)
commit4033c5e1b77097c28733c1ead3b08c2fc4f5d082
tree3354f2c508126ef4a9316d72b4e8224fa2dd189a
parent5af217b3462310c746cc8ad76b1d920678b56890
parent0666e1cd5ca508f0bc65ee038dbcd424e9a6e988
Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f  -s ours am: 79e124c9c7  -s ours
am: 0666e1cd5c  -s ours

Change-Id: Ibddc7b339d8cba53c73b2471bab11eabca82fa33