tree eaa9f0a95e4b1003a38d7d34d6e50a263e41616a
parent 886d5f00de55f4a1e80a6a50e6ca1f467e24daec
parent e5d19bc0f12a3c3b6324d63db617d3bcc0b7bfd4
author Vijay Venkatraman <vijaykv@google.com> 1489183254 +0000
committer android-build-merger <android-build-merger@google.com> 1489183254 +0000

Merge "For msm8996, add dep on sound_trigger.primary_headers" am: 60e731fa9f
am: e5d19bc0f1

Change-Id: I9c0da8b03b5fbed30979be2c00fb27d6e4a49e1a