tree d8a02020fe5f4a22cb38deb9edef98be6bb8401e
parent 6ea4e11d9817d85eb5c0ff445154985e4eb0c534
parent 958876fe55ea0fdeb73c72240a2f2bab32833443
author Jean-Michel Trivi <jmtrivi@google.com> 1416865168 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416865170 +0000

Merge "Add support for audio focus locking" into lmp-mr1-dev