tree 32d7323a4a6ca6b77d8b2fd9f91e992393a49ee4
parent 276322ad2e1c384f3805096ba1468da8200aa084
parent 17f1fc6c76045e6fb8404150e63b4e6bd7368c71
author Chih-hung Hsieh <chh@google.com> 1472596886 +0000
committer android-build-merger <android-build-merger@google.com> 1472596886 +0000

Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c
am: 17f1fc6c76

Change-Id: If968940949e97633e99832a3edc1d3003662dac2