OSDN Git Service

Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
authorDavid Brazdil <dbrazdil@google.com>
Fri, 23 Mar 2018 18:37:13 +0000 (18:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 18:37:13 +0000 (18:37 +0000)
commitff585515239a39c77a215d574f945cf7e814925c
tree5cb27dfbadd45f44b5ff5d8d812e7263675d5b94
parent64a94872495edc75dc73b6e71ff05d65cbdffb82
parent600f3bb4fb8dbf2566436e708ecf590b468072a7
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
am: 600f3bb4fb

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