am 15ef4168: am 961d2c6a: Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb

* commit '15ef4168a9ce71f58d8d11cb531f88fdb4a3729d':
  b/3350774 avoid screen jumping when pinching to zoom.
tree: 93cffc0891a60598da422ec59ed4377227b86352
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE