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)
am: c704b0379f  -s ours

Change-Id: I9e8ab06e4b6e9f08bb01909efbb0aff03c44bb67


Trivial merge