tree 2d0efe2ccf34ea33d0280b7a348e232696d37f5b
parent aec686dc2994ae6e70211cdde96b08a20a609df7
parent fcfde5fa27d3a415bed47fd2e83398dfce88fbe3
author Jaewan Kim <jaewan@google.com> 1522041138 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1522041138 +0000

Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev