OSDN Git Service

Merge "ActivityManagerService: fix nativehelper includes"
authorSteven Moreland <smoreland@google.com>
Thu, 27 Jul 2017 17:13:38 +0000 (17:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 17:13:38 +0000 (17:13 +0000)
commit4d286628186a0727c505d5693b03619c17e4aa05
treeb8dc8adedd5d617e5a53ef68717d6ba36b026817
parentef21b72dd1a1970b6fc585f329fdcda0b49ddc50
parentc372715bebb86a1b62e83d822fbc648892f1549f
Merge "ActivityManagerService: fix nativehelper includes"
am: c372715beb  -s ours

Change-Id: I57d45557c585238f9e98e0bf81c06058235d7e74