tree 94d061d9ef125a1504be7ddff5cbba7d4b7f9503
parent fdefe34f40ea6c8964677eaa9107958b0bdf76d0
parent 8ba53d87a2d311ff4b3f04e30b2e09309ae7421c
author Eric Laurent <elaurent@google.com> 1406938789 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1406915615 +0000

Merge "Revert "Revert "sound trigger: added permission checks""" into lmp-dev