tree 5c9941b00678ccd0b40a3b7a0f428c2f8c073ce2
parent 7b6e09bb821a925f487ab21da47f960d17e6426d
parent ddb22d4e54afe67eab6f6bcfa9d95039158aa7ab
author Hyundo Moon <hdmoon@google.com> 1483494044 +0000
committer android-build-merger <android-build-merger@google.com> 1483494044 +0000

Merge "Fix AssertionFailedError in MediaSessionCompatTest" into nyc-support-25.1-dev
am: ddb22d4e54

Change-Id: Ie3589a579db30257366d9e73647596775abde9f9