tree c6a09085fb712ded37d47ea2cc45960e558f85ca
parent 67b00d8b2d96e8133c249bcbc0fb63c49e10e022
parent 04c12ca061cd4ffe79a8eb5d570c4830a0950c85
author Eric Laurent <elaurent@google.com> 1378944877 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378944877 +0000

Merge "Add HOTWORD audio source to audio.h" into klp-dev