tree d6939dddbbab70471f6a78a9e3324c4f97989ff2
parent 2421a4ba309f082a83be9b8e385c00cd8e0043f6
parent d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f
author Jean-Michel Trivi <jmtrivi@google.com> 1404233108 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1404175237 +0000

Merge "Support for audio attributes on audio output of media player"