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

* commit 'ba492eb636a45cd5686fb0e6eb807e3deaa500fb':
  Fix javadoc for MediaStore.Files.FileColumns constants
This commit is contained in:
Mike Lockwood 2011-01-26 19:07:34 -08:00 committed by Android Git Automerger
commit 23ba0b9ff7

Diff Content Not Available