tree 54b9159cc7265d4cc0f2cd36676138d12ffc0554
parent 406a9e294d84892573d24992d62fe1ecc0b1962f
parent 00397e02c87c2df00468dd28bad4e73b532b90d0
author Marco Nelissen <marcone@google.com> 1268247503 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1268247503 -0800

Merge "MEDIA_PLAYER_STATE_ERROR is not a bitmask (b/2502881)"