Reconcile with gingerbread-release

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