tree 3711e25321d019cb2ad0fbcbf8ccfa437918b0f9
parent 3d6a3ede377833d5f4fc40daab6cd958543a5fb0
parent 4356269be6d2b62bbb945364e8fc4beb99e1aada
author Eric Laurent <elaurent@google.com> 1437006337 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437006338 +0000

Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev