tree 32873640d651690a6d4b9c001815787f40d58abd
parent 1f7f8bfddb479ad35073e5e81d56a9c1308cf08e
parent 369438a23f681f0fd6b573d2c7a4897d95a031fa
author Jaewan Kim <jaewan@google.com> 1495589317 +0000
committer android-build-merger <android-build-merger@google.com> 1495589317 +0000

Merge "Allow media apps to receive media key events after the phone call" into oc-dev
am: 369438a23f

Change-Id: I229ddcbc289cfb5b88d1fe2c4524c568fab4fdf4