am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1

* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
  Support loading image and paused image for inline video
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE