tree 5e5d27efe0b134ec2014e54258443ba32ddbcde1
parent 668050894656f893d82e7906e201a5dbfca92bae
parent 9b59cc7bad3e67c18ed1e1ab19e13fcd1e48b0ae
author Tyler Gunn <tgunn@google.com> 1488165057 +0000
committer android-build-merger <android-build-merger@google.com> 1488165057 +0000

Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be am: 2f96f34373
am: 9b59cc7bad

Change-Id: Idee131069636fc8a4ea086a3d41bce4c1dfcbda6