Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev

author Svetoslav <svetoslavganov@google.com>

Sun, 14 Jun 2015 20:00:59 +0000 (20:00 +0000)

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

Sun, 14 Jun 2015 20:01:02 +0000 (20:01 +0000)
author Svetoslav <svetoslavganov@google.com>
Sun, 14 Jun 2015 20:00:59 +0000 (20:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 14 Jun 2015 20:01:02 +0000 (20:01 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/removed.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/system-removed.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
author	Svetoslav <svetoslavganov@google.com>
	Sun, 14 Jun 2015 20:00:59 +0000 (20:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 14 Jun 2015 20:01:02 +0000 (20:01 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/removed.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-removed.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