tree 1b0bc9db13328d116a1abe6e2b5d0eed64c90aa6
parent c6442fe9e63ab20d354837a5a35be97f0953a779
parent 841326466aa6e87a92d5dadffe05a57952fb1d01
author Geremy Condra <gcondra@google.com> 1366935872 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366935873 +0000

Merge "Grant Keystrore and DRM services access to /dev/qseecom." into jb-mr2-dev