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