OSDN Git Service

am 25d12e3f: Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev
authorCedric Ho <cedricho@google.com>
Mon, 27 Apr 2015 21:10:55 +0000 (21:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Apr 2015 21:10:55 +0000 (21:10 +0000)
commit452304f7195a782f5448ecf8bda7be11d5536982
tree49cac99a612c0bb9a8048b20b21bcadb8ef38f04
parent528887b23bdf105835e98f2e50ecfbbb71468fb9
parent25d12e3f6a5ef15add0c0ccb560bb842283b98e2
am 25d12e3f: Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev

* commit '25d12e3f6a5ef15add0c0ccb560bb842283b98e2':
  Enable VoiceInteractionService on watch.