tree 135024468cfe2f7ef64d7cf01b51808f20742ce6
parent 98cb95a998bdbbc61d496bb7348fa5e739199870
parent 477d1197c3c25c01ace7ea4494437c23720a2eb3
author RoboErik <epastern@google.com> 1407519200 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407518768 +0000

Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev