[automerger skipped] Merge "Fix typo in IMS compat translation code"
am: 9acd628881  -s ours

Change-Id: I28804ad84d37bb86db77e736bd0b724b62a64ff9
tree: 85e7015e236862b3747058678d1b781c0b038e95
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk
  5. OWNERS
  6. README.txt