am 6bf02664: am ccaffa8d: Merge "Use char x[] rather than char x[0]."

author Elliott Hughes <enh@google.com>

Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)

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

Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)
author Elliott Hughes <enh@google.com>
Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)
diff --cc include/media/mediascanner.h
Simple merge
author	Elliott Hughes <enh@google.com>
	Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)