tree 465c5bfa940496ac478a38070fb8fa3f3c08def2
parent 13a6970791a5c113bc5fa10016b778e14b9bf0d3
parent 0212be5150fb9fb3c340f3c7e51f6126372cc6f9
author Jean-Michel Trivi <jmtrivi@google.com> 1417914868 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417914870 +0000

Merge "Support collaborative audio focus handling" into lmp-mr1-dev