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:22:09 +0000 (15:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)
commit81972a18e4b6a546616c3d3a522485806816d5fe
treedb87fdb972683c8a6e7201f2b0f47497f5765bc5
parent0fed7e3282d240b5381dc7e206045a3397d0bf51
parent7d7c269944f0bb55b7fde765d850eb6942a215ef
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am: 7d7c269944

Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d