tree 0a3665c54e3de6f6171854a31b3c7ac169e4dae2
parent 52626a1dea0a2b72a271421e4492889ae5cbca67
parent 5f23d1645c283bf50ae9563c7fcce57e44e5d53f
author Sungsoo <sungsoo@google.com> 1478714676 +0000
committer android-build-merger <android-build-merger@google.com> 1478714676 +0000

Merge "MediaBrowserCompat: Fix NPE" into nyc-mr1-dev
am: 5f23d1645c

Change-Id: I8f59160ed812601282504ee5677537e9bf85e1c3