Zhijun He cc6b5bf214 am e4688207: am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev ...

* commit 'e468820757743b95fb5622ae3010fbccb9338a0c':
  Camera2: Add MAX_CAMERAS_IN_USE error case handling

2013-09-16 11:30:34 -07:00

..

java

am e4688207: am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev

2013-09-16 11:30:34 -07:00

jni

am 3b8a7a04: am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev

2013-09-16 10:45:01 -07:00

res

Merge "Add comment header for API 20 in public.xml"

2013-09-16 17:19:28 +00: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