Ruben Brunk 3723af531a am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev ...

* commit 'c57f309a1b5be6fe9156405feb48637c036880a4':
  Add experimental camera session prepare API.

2015-08-17 17:37:16 +00:00

..

java

am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev

2015-08-17 17:37:16 +00:00

jni

am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

2015-08-16 01:34:42 +00:00

res

am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 02:36:17 +00:00

tests

Fix check for caller being the active network scorer

2015-08-06 12:53:59 -07:00