OSDN Git Service

am fce38213: am a2440a17: am 43bc655b: Add code for isKeyphraseActive and some loggin...
authorSandeep Siddhartha <sansid@google.com>
Thu, 17 Jul 2014 18:27:35 +0000 (18:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:27:35 +0000 (18:27 +0000)
* commit 'fce382131f7e9a54a3141e3ce8a894d069ed0fab':


Trivial merge