Disabled verbose logging

Change-Id: I38079209472919c67ca07ff25a95f146f22ebb8c
Merge commit 'ae62a1d602e7ed2e0e30e271bddbb27aa71469f6' into HEAD

* commit 'ae62a1d602e7ed2e0e30e271bddbb27aa71469f6':
  Disabled verbose logging

Conflicts:
	src/com/android/providers/media/MediaProvider.java
Scan any external media for content

Change-Id: Ibbebce1d6c95472b07ae92d3355e5a60b5b7b45c