am 8287edd3: (-s ours) am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the...
am 8287edd3: (-s ours) am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
* commit '8287edd3':
DO NOT MERGE. Only scroll if the IME is open in certain cases.