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