am 605a6fea: Merge "Fix the safety net Bug: 5453150" into ics-mr0

* commit '605a6fea750c4acc96a5136ecaf7162e0a858b9f':
  Fix the safety net Bug: 5453150
tree: b0ac9a8ac09c4feadee73a91b2b6e50a4cfdc2cd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk