Reconcile with gingerbread-release

Change-Id: Ibdf7e62e8fd0d3c6991767adb55d96c5e1bd4e97
tree: 0849d465fe09e0aef69492405e3528db08499822
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk