am eff8dadc: am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev

* commit 'eff8dadcbd336915874485b9ae4532421c07e768':
  Change the text color of timer in MediaController