OSDN Git Service

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours...
authorSteven Moreland <smoreland@google.com>
Thu, 3 Aug 2017 01:29:35 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:29:35 +0000 (01:29 +0000)
commit048f658ed2dac14cd9fbbf27462023e352f360fe
tree1e5c8c86dc8bbe2e0c085c4bab5865436f839c55
parent01e5bf6fa736d0a284359a491344652e2d5f2b6e
parentc704b0379fd6875a477e1104a6a9d0838a1863e0
Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f  -s ours am: 79e124c9c7  -s ours am: 0666e1cd5c  -s ours am: 4033c5e1b7  -s ours
am: c704b0379f  -s ours

Change-Id: I9e8ab06e4b6e9f08bb01909efbb0aff03c44bb67