tree 70f535bbcaa1fe619b2c26ab871b1d69a4d13021
parent 62bd6fc1ad1fbbc474bc3575d763aa01c83ccd84
parent eae08c63d6d13db518731d68e888d26a8c055544
author Sungsoo <sungsoo@google.com> 1483645079 +0000
committer android-build-merger <android-build-merger@google.com> 1483645079 +0000

Merge "MediaBrowserCompat: Make getItem work properly" into nyc-support-25.1-dev
am: eae08c63d6

Change-Id: I689e04178198f0caf8542cbf21fe8ebe4595134c