Mass merge from gingerbread - do not merge

Change-Id: I283edea7175253ff92e8d8d66c4182606baf42bf
tree: 207513fd92607adce767567d0f778d8138df4dbd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk