OSDN Git Service

am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
authorLajos Molnar <lajos@google.com>
Sat, 22 Nov 2014 06:51:13 +0000 (06:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Nov 2014 06:51:13 +0000 (06:51 +0000)
* commit 'c3245a0555fbd9b02407edebfdac386a62a4af0a':
  Reword NuPlayer developer settings to say AwesomePlayer


Trivial merge