tree 74682f6566fe6c8979f04b4736a54de7b4a1d668
parent bbbee4159707c3cb6a23d7e7a0b5202dce688fea
parent 0f6525f932e852d24b42bcac1e55af1b393d89cf
author Jaewan Kim <jaewan@google.com> 1474537858 +0000
committer android-build-merger <android-build-merger@google.com> 1474537858 +0000

DO NOT MERGE Check caller for sending media key to telephony service am: a9c585237f am: 6f902fc2cf am: 05bacff3a9  -s ours
am: 0f6525f932  -s ours

Change-Id: I6118bbb4dbeafdf1aee0ffd7c7300da8a881f66d