Merge "Fix compilation error"
tree: cb5e9e7bb198c2b5324f3bb9bb5561088c05bf12
  1. dashplayer/
  2. QCMediaPlayer/
  3. Android.mk