am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into...

author Jeff Tinker <jtinker@google.com>

Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)

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

Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)
author Jeff Tinker <jtinker@google.com>
Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
author	Jeff Tinker <jtinker@google.com>
	Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 3 Apr 2014 01:35:28 +0000 (01:35 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history