tree 8e9ebeb73faca811b39dd9a2eb92608cf865c314
parent 912f705f1f98ba2fc744601994dfbe12f391b0ae
parent 6cf397508eb7edef13baefad942a59b058ed450b
author James Cook <jamescook@google.com> 1433548197 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433548199 +0000

Merge "Allow different visual and voice assist prompts" into mnc-dev