OSDN Git Service

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master...
authorSteven Moreland <smoreland@google.com>
Wed, 2 Aug 2017 15:47:36 +0000 (15:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 15:47:36 +0000 (15:47 +0000)
am: c64c642e14

Change-Id: I7815db015b05c148ec7b62783a4843e0a4c04e90


Trivial merge