OSDN Git Service

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours...
authorSteven Moreland <smoreland@google.com>
Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)
commitc704b0379fd6875a477e1104a6a9d0838a1863e0
tree70e80631054132dbae79ebfce39c8f1dfe216a01
parent60d63fa4fb0286b6de50c1243840c3a663998dbb
parent4033c5e1b77097c28733c1ead3b08c2fc4f5d082
Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f  -s ours am: 79e124c9c7  -s ours am: 0666e1cd5c  -s ours
am: 4033c5e1b7  -s ours

Change-Id: I0123c124dcd6f0b74af3c6c57783e318c0892323