am 5ca6dc46: Merge "Move toUriRecord() to a more findable place." into gingerbread

Merge commit '5ca6dc468382c95178ee61a98cfb097aa8bbc10f'

* commit '5ca6dc468382c95178ee61a98cfb097aa8bbc10f':
  Move toUriRecord() to a more findable place.
tree: 4251a0a90db1a906e97afcc226a7d624b60b9cbc
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml