tree 1a750277f1b18b065e4874ef89a2b5d223adeeb5
parent ee47e0219e45ea3a280b07ae011aa498f86430d0
parent 8b2c19b5780bc2dedb51982b2a40c573e1c86157
author Lajos Molnar <lajos@google.com> 1416852736 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416852736 +0000

am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

* commit '8b2c19b5780bc2dedb51982b2a40c573e1c86157':
  Reword NuPlayer developer settings to say AwesomePlayer