tree 481c924526340ba857800b0041b4c3578408aab4
parent d73b1134e795fa521e71dc567b6b3bde9cdd498d
parent ebdc77a0a617a1112de28822de7219762d114294
author Paul Mclean <pmclean@google.com> 1496697601 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496697602 +0000

Merge "fix b/62040757 - bad pointer to native audioplayer in 32-bit builds." into oc-dev