tree e12aeb50db20851ff4f8e07996e73055281a2c50
parent 4675ed8cc7787e986ae72a768e30ebb89ca03306
parent d58f07f58a8230ee906b9af7d7a89ac876158ab6
author Annie Chin <afchin@google.com> 1467847790 +0000
committer android-build-merger <android-build-merger@google.com> 1467847790 +0000

Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
am: d58f07f58a

Change-Id: I6a9c537b71084696915e744102a6a12f532942d5