OSDN Git Service

Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
authorWinson Chung <winsonc@google.com>
Wed, 19 Apr 2017 01:34:40 +0000 (01:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 01:34:40 +0000 (01:34 +0000)
commit4579de825bf080de9ee3dc28407cd59a99b9f1ea
tree9714c364f0865a7ec42c7b1851d8f6080e1a11d2
parent32a795431508aa44652589ecb2646a7c0028039f
parent982ce6402bebc20393bddb1facd8249217509eb4
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
am: 982ce6402b

Change-Id: Ic8c30fa320022bfc5233738f13f45bb4b30bb4e3
services/core/java/com/android/server/am/ActivityManagerService.java