Merge "Add permissions for the InCallUI Split." into klp-dev

author Santos Cordon <santoscordon@google.com>

Tue, 17 Sep 2013 20:43:03 +0000 (20:43 +0000)

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

Tue, 17 Sep 2013 20:43:04 +0000 (20:43 +0000)
author Santos Cordon <santoscordon@google.com>
Tue, 17 Sep 2013 20:43:03 +0000 (20:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 Sep 2013 20:43:04 +0000 (20:43 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
author	Santos Cordon <santoscordon@google.com>
	Tue, 17 Sep 2013 20:43:03 +0000 (20:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 Sep 2013 20:43:04 +0000 (20:43 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history