tree 857ec81e876d35c76b2f7fd149df6a3771edaa4f
parent 736f5f073a621d39daa01372a4b59bdf7de2f618
parent 104e37eb4b0985deccf90e8aad6cb153fe542b1c
author Sungsoo Lim <sungsoo@google.com> 1482801592 +0000
committer android-build-merger <android-build-merger@google.com> 1482801592 +0000

Merge "MediaSessionCompat: Test for checking NPE in setCallback" into nyc-support-25.1-dev
am: 104e37eb4b

Change-Id: I6db2595d328350115f16fbb89fb678a908a9a541