am 2e3124d1: Merge "Tweak around with ImageRecords / MimeRecords" into gingerbread

Merge commit '2e3124d11bdcd544a6b215cc164818a866c442cf'

* commit '2e3124d11bdcd544a6b215cc164818a866c442cf':
  Tweak around with ImageRecords / MimeRecords
tree: 5b105b8f93abf3a89ccb96cee2e56f29c9cc961a
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml