tree 05798d253056f9f41a6eeb9fb329d857cff88900
parent 140d2d3e6baad8b7bb1ff3853c0951e8e9a0ae81
parent d60e875a97867c1a6ed84325bb70f7ffe8ce4521
author Jean-Michel Trivi <jmtrivi@google.com> 1399916840 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1399916840 +0000

Merge "Define audio attributes"