tree 6a5bf11cbba12b62e51ace70e1a301a7cd37cc52
parent 3a4764463553c26ce76336c5e71fdc81d7c79920
parent cd82f70f91f97b555744ecea494e8e75990e9512
author Paul Mclean <pmclean@google.com> 1496698288 +0000
committer android-build-merger <android-build-merger@google.com> 1496698288 +0000

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

Change-Id: I39ee98f28d81f3e0f93732a561df3c6b5548f0fe