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

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