Chet Haase 79f245e472 am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev ...

* commit '90b10f89d7c1dd217f07f4b51ed8e5c93deccc52':
  Fix TechChange's assumption about TextView targets

2013-09-12 12:44:22 -07:00

..

java

am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev

2013-09-12 12:44:22 -07:00

jni

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

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

res

am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev

2013-09-12 11:09:26 -07:00

tests

Use setAirplaneMode() API for Connectivity Manager tests

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