tree 5e76a984186a575c57325af0444f1afc48622ca6
parent 725dd4ac85bcc1e9ee8d5322807c19d17d581aa0
parent 0474773aab24594f4f4d395bf058d6f5b16db958
author Andy Hung <hunga@google.com> 1459357577 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459357578 +0000

Merge "Stop SoundPool decode if NdkMediaCodec returns null buffers" into nyc-dev