Igor Murashkin ddc74f5ed1 am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev ...

* commit '6c62163976844b28859fca322b28af907ec2856d':
  camera_metadata: add android.lens.state MOVING enum value

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

..

java

am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev

2013-09-12 11:26:16 -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