tree 38874de1ee28b1effd4f948a5788545fc8baa8f9
parent b2969355c933aa09145b1689a44eef35ef193b1e
parent 8ce7b9b6ffa047a8868052a9ac44eeed85cfbe37
author Chris Thornton <thorntonc@google.com> 1468001378 +0000
committer android-build-merger <android-build-merger@google.com> 1468001378 +0000

Merge \\"Updates to the sound trigger test app\\" into nyc-mr1-dev am: e1fdcc49fd
am: 8ce7b9b6ff

Change-Id: Ib96262c213f9cc397d49b6be6d2ca5975a580ce4