OSDN Git Service

Merge "ActivityManagerService: fix nativehelper includes" am: c372715beb -s ours...
authorSteven Moreland <smoreland@google.com>
Thu, 27 Jul 2017 17:27:31 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 17:27:31 +0000 (17:27 +0000)
commit5738af9abc4aef1928b6128b38b3729fc8025682
tree339e2ac90a177b4810d8f5437d291c0b46deec1d
parent6a7dc737a5a4269fecf7538e5b0eb5e148aa2f2a
parentb6c4ccb72436be39d9221ee5284d767ec022b880
Merge "ActivityManagerService: fix nativehelper includes" am: c372715beb  -s ours am: 4d28662818  -s ours
am: b6c4ccb724  -s ours

Change-Id: I451558f083495ff80b44f41f66fd18f1cbe1a6fe