OSDN Git Service

Merge "com.android.server: use proper nativehelper headers"
authorSteven Moreland <smoreland@google.com>
Wed, 2 Aug 2017 23:19:33 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:19:33 +0000 (23:19 +0000)
commit79e124c9c7a3b1fabea4a2aca9478f14a9e7656e
tree86ce5ffbe3613b595f01882f70b4d79d40e92d56
parent1453059ae347140e2285edc6dab5923d5b0fcf28
parent41a7f5a64f88d417b519c7a3fac3dc473def787d
Merge "com.android.server: use proper nativehelper headers"
am: 41a7f5a64f  -s ours

Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567