tree ae2d1f9804fee2708f94eae30467f92d9250512f
parent 54b54ced24a296b9ecb064bb33d5ebe1e92ae466
parent 944a4e92d6d9619fa1a2172a4ec9dc683eb65b40
author Ian Lake <ilake@google.com> 1435373001 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435373003 +0000

Merge "Ensure MediaSessionCompat.Callback behavior matches framework" into lmp-mr1-ub-dev