OSDN Git Service

Merge "ActivityManagerService: fix nativehelper includes" am: c372715beb -s ours...
authorSteven Moreland <smoreland@google.com>
Thu, 27 Jul 2017 17:41:38 +0000 (17:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 17:41:38 +0000 (17:41 +0000)
commitc2eb24e7180d942c3b580cf8c40100a59b6fa2b6
treeab1643b7d2955b4cffc6a44e14485498f79ec5bc
parent7e362a92b5ce24de2f8ecd4d281b22667cab23cc
parent5738af9abc4aef1928b6128b38b3729fc8025682
Merge "ActivityManagerService: fix nativehelper includes" am: c372715beb  -s ours am: 4d28662818  -s ours am: b6c4ccb724  -s ours
am: 5738af9abc  -s ours

Change-Id: Idc5e97bcf1290adbcf6b0a89a077596d03916dc2