Jeff Sharkey c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev ...

* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.

2013-09-12 09:17:02 -07:00

..

java

am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev

2013-09-12 09:17:02 -07:00

jni

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

2013-09-11 17:17:50 -07:00

res

Merge "Import translations. DO NOT MERGE" into klp-dev

2013-09-12 02:45:12 +00:00

tests

Use setAirplaneMode() API for Connectivity Manager tests

2013-09-11 14:44:30 -07:00