tree 4b355de6835ff195aae73659b17459292adf4a30
parent 8c12b2138af04ee6cf0ac5ecd15044147ce14863
parent a08ba3ef31e135ded437b0ca6f83bfe77a31c33b
author Jean-Michel Trivi <jmtrivi@google.com> 1493668754 +0000
committer android-build-merger <android-build-merger@google.com> 1493668754 +0000

Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev
am: a08ba3ef31

Change-Id: I95991e5b2151f689b27e32bd5f187dc4615f1bf0