tree 71e9eb5c5a8283981556b03e2661b1427ef978e5
parent 3e6af6f9ac5e86cb0bca4666b4439c8d251aef0b
parent 97a3377dfe05897290953acc64ea24a4092fe5dd
author RoboErik <epastern@google.com> 1409267300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409267300 +0000

am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev

* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback