am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
tree: 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE