Merge "Use Java 7 diamond operator"
tree: 0ceda5aefb24fa3ffa8e52e3d1f8a8757f27296e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk