OSDN Git Service

am 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist is voice...
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 11:32:02 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:32:02 +0000 (11:32 +0000)
commit25e493239ea5b1dec98df8f987695a7fa299df79
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parentb0c6d9f0a3c27c8975eda3270187970dc602b537
parent8f37d4bc11841a3084a31471756b7d61d433c2eb
am 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev

* commit '8f37d4bc11841a3084a31471756b7d61d433c2eb':