Manually merge d877e0c4 from gingerbread-plus-aosp

Change-Id: I2709295a0170928647159a9254e930eb04681fd1
tree: ae96f964353e889005ca21952470687f2a8b4829
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml