OSDN Git Service

Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be
authorTyler Gunn <tgunn@google.com>
Mon, 27 Feb 2017 03:05:21 +0000 (03:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Feb 2017 03:05:21 +0000 (03:05 +0000)
commit9b59cc7bad3e67c18ed1e1ab19e13fcd1e48b0ae
tree6aff349ae6a99c5122d434dd31562553143eef2f
parenta84292c9d72e2fef67a2a1a3671dfbdea432533e
parent2f96f34373a69928991f2139b81f3de07c6b8199
Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be
am: 2f96f34373

Change-Id: Ia14b054be24acc2a767707b72a12902460cd11e7