tree 7255d8e0ac097b39906ad7258f71ed851bb4cc17
parent 798cccb659321dc60ef4dab87e64834b6c891620
parent 0f49f82e9777b7878fbc4566779dbe29191141ba
author TreeHugger Robot <treehugger-gerrit@google.com> 1487824670 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487824674 +0000

Merge "VideoView: option for audio focus, support for AudioAttributes"