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