tree 8ae3846733e716d5aa4a78830d65f00611dbba38
parent 36a5a454fbc96272f1ce825cb02f7ce7057f8d3e
parent 66179d7c6e07230bfdc38412894d18d51bad9b77
author Jaewan Kim <jaewan@google.com> 1474581284 +0000
committer android-build-merger <android-build-merger@google.com> 1474581284 +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 am: bccafb445e am: 59cfb1a0c2 am: 0caf82b94e  -s ours am: 31d2e28526 am: 751fbeb285
am: 66179d7c6e

Change-Id: I18bd5ece6097b875542ac6a735313e20f58b3186