Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev

author Nicolas Prevot <nprevot@google.com>

Wed, 20 Aug 2014 16:55:38 +0000 (16:55 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 16 Aug 2014 04:36:37 +0000 (04:36 +0000)
author Nicolas Prevot <nprevot@google.com>
Wed, 20 Aug 2014 16:55:38 +0000 (16:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:36:37 +0000 (04:36 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Nicolas Prevot <nprevot@google.com>
	Wed, 20 Aug 2014 16:55:38 +0000 (16:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Aug 2014 04:36:37 +0000 (04:36 +0000)