Eino-Ville Talvala 028c2e4e26 am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev ...

* commit '33689420d13283f192c66ca7e78776064a2def28':
  Camera2: Add camera type to getNumberOfCameras.

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

..

java

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

2015-08-16 02:37:19 +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 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 02:48:19 +00:00

tests

Fix check for caller being the active network scorer

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