Eric Laurent 835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev ...

* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource

2013-09-11 17:25:05 -07:00

..

java

am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev

2013-09-11 17:24:56 -07:00

jni

am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev

2013-09-11 17:25:05 -07:00

res

am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev

2013-09-11 17:25:05 -07:00

tests

Allow SSL caches to be installed directly on SSLContexts.

2013-09-11 08:49:59 +00:00