am 4f5ddf03: Reconcile gingerbread-plus-aosp and honeycomb

* commit '4f5ddf036aac6dffba8194055a01957f35bc0285':
tree: 9c20498dc91a6d735c51c996469b7aeb6c1cf3ea
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk