Merge "Fix a view-related crash"
tree: 012410400978bcc9fc21c2f480f299ceeb6a9cc4
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk