am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb

* commit '278a04eb7a56459c2f9e3b47dcced6522a87f1d1':
  Fix javadoc for MediaStore.Files.FileColumns constants