am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev

author Fyodor Kupolov <fkupolov@google.com>

Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)
author Fyodor Kupolov <fkupolov@google.com>
Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)
diff --cc cmds/am/src/com/android/commands/am/Am.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Fyodor Kupolov <fkupolov@google.com>
	Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)
		1	2
cmds/am/src/com/android/commands/am/Am.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history