Reconcile with gingerbread-release

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