OSDN Git Service

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours...
authorSteven Moreland <smoreland@google.com>
Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)
am: 4033c5e1b7  -s ours

Change-Id: I0123c124dcd6f0b74af3c6c57783e318c0892323


Trivial merge