tree 8a3c06b759689cff725bbf98d0b383df101cc47f
parent b6913b8a4e2a441a2ef877d3f3997be933cf8762
parent 5a3e31b8098d2f1dd1ec7654c799dfd147c2b10a
author Sungsoo Lim <sungsoo@google.com> 1481846919 +0000
committer android-build-merger <android-build-merger@google.com> 1481846919 +0000

Merge "MediaSessionCompat: Fix NPE" into nyc-support-25.1-dev
am: 5a3e31b809

Change-Id: I813df44ab9fa6ef49c5ff038b64cbbca318fdf27