OSDN Git Service

Merge "Fix issue #37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 19 Apr 2017 22:29:59 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 22:29:59 +0000 (22:29 +0000)
commitc98b0520849716183009e91a458f9a3325296ece
tree8f94d61afd2547a3ece8ff3ca0f87a2d45aa9437
parent72287ab7667aaf5e677becde87dfa270a9672187
parent8305a1fb38ebb701af7cef2b8698315e2d9ffd17
Merge "Fix issue #37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
am: 8305a1fb38

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