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:38:40 +0000 (15:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 15:38:40 +0000 (15:38 +0000)
commitc64c642e14ab666c93a97716ac6b62144098ef3e
treeeb85b3cfb91f26e30be24548317c1e6b173b0a1d
parent2ef5de5dda7a0bb73ba53aacf3ff7a5b03011e9e
parent795bcc5b756e5b892194864682152c9cb1ca7f29
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4
am: 795bcc5b75

Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a