OSDN Git Service

Merge "OMADM intent sent by both system and apps." into nyc-dev
authorAmit Mahajan <amitmahajan@google.com>
Tue, 17 May 2016 17:48:44 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 May 2016 17:48:44 +0000 (17:48 +0000)
commitdb4c3aff334c0cebea1e337fadb4b535e8ccaffa
treeba1ce26a2f74a2741e114f6c4216f733f691854a
parent81505b48e5c00e067d684b39de73b93aeaffefb2
parent65ca16ebab701c82895a0f1bf5ba0344aff44e50
Merge "OMADM intent sent by both system and apps." into nyc-dev
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

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