am 91a0a2d2: (-s ours) am c369fe3e: (-s ours) Merge "Add tests for...
am 91a0a2d2: (-s ours) am c369fe3e: (-s ours) Merge "Add tests for InputMethodSubtype. DO NOT MERGE" into jb-mr1-dev
* commit '91a0a2d2':
Add tests for InputMethodSubtype. DO NOT MERGE