merge in gingerbread-release history after reset to gingerbread
tree: 83d95ed6c92a0c09b1c163bdf2f9c277e3b7fc52
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml