Eino-Ville Talvala b91133c73a am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev ...

* commit 'a937b013f5ebe81562a0d298f9c990c975ba1dcf':
  Camera2: Add a missing key for controlling shading map mode

2013-09-12 11:39:42 -07:00

..

java

am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev

2013-09-12 11:39:42 -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 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev

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

tests

am 6c2ad7ac: am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev

2013-09-11 17:31:04 -07:00