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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base