am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp

* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9':
  Support post-decode video rotation.
tree: a70022457dcbf54c8116488b7b9df1ad9c22c859
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE