tree 1980c57399923b77a78e8e99e32b9b1f0278f637
parent 35e231ce61fa4b1606b97466de1c96e8688c6a86
parent 3cc527755f5e2f9912a6b4a50a8222494425ed55
author Sungsoo Lim <sungsoo@google.com> 1481846084 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481846084 +0000

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