tree 13c20609d3ad12a613f33c1c701cadadc712a783
parent 5d8bcd285d190de924a47c39155530038799d148
parent 7412965a544e0e5249d91c3fec9edef5fa190990
author RoboErik <epastern@google.com> 1411773234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411773234 +0000

am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev

* commit 'e825d6958821a4d63c2e7db39c1c02b4300dd1c8':
  Don't forward media keys to the app if the phone session is active