am f43fb14a: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'f43fb14aead26312bf10341f8f3f8e19247263c5':
tree: 359528e8d8c2f858cb7f1c863aaeb52a778de63c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk