am 24147eee: remove getRecordType(), other cleanup.

Merge commit '24147eeedccccc552ba116c74384a8ea22da9dcb'

* commit '24147eeedccccc552ba116c74384a8ea22da9dcb':
  remove getRecordType(), other cleanup.
tree: ccd7e9f3e37b1652172bacc4d27b6929206b99d9
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml