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

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