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

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