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

* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.

2015-08-16 02:55:33 +00:00

..

java

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

2015-08-16 02:55:33 +00:00

jni

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

2015-08-16 02:55:33 +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

am 558f1030: am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev

2015-08-07 20:55:42 +00:00