OSDN Git Service

Merge "Use UiContext with StrictMode Dialog" into oc-dev
authorAdam Lesinski <adamlesinski@google.com>
Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)
commite9a4951c4d5f85b2e060678d4355907071153395
tree1fa7d1789352d11cbe4b06a35216f700588f168b
parent8b5b0c2bfa01a50dc32b07673f5d9fcec6536ecc
parent9274d87a0e44eb8a7ce9b9a6e5472856ad0479d5
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am: 9274d87a0e

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