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:44:30 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:44:30 +0000 (23:44 +0000)
am: 79e124c9c7  -s ours

Change-Id: I550d6ce82513fc8e160597ba2ff89b6c5efa286a


Trivial merge