am 769540c1: Merge commit \'5cb300ef\' into manualmerge

* commit '769540c1ed68cb52b455630d3547a54aff71497a':
  Fix VVM playback control buttons don’t support TALKBACK
tree: bbb90d3066504784b6a0d2ac7770fe8e018f975e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags