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.
tree: ae32e366e7eea386e2213a28ed10d5e6bad0b31c
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE