tree 2dd0eeb99295288a66601d0ab18924163907a13d
parent bd750cf457960c49c521278c10bf9071694ffe2a
parent 9219bc8f66d97ea76b4a7a28370ccbfb574d224a
author TreeHugger Robot <treehugger-gerrit@google.com> 1523406255 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1523406255 +0000

Merge "Consolidate lock objects within MediaPlayer2Impl" into pi-preview1-androidx-dev