OSDN Git Service

am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras....
authorEino-Ville Talvala <etalvala@google.com>
Sun, 16 Aug 2015 01:47:55 +0000 (01:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Aug 2015 01:47:55 +0000 (01:47 +0000)
* commit 'eec25a4ffecc0c9a726aa284d29d0b7a1e58a888':
  Camera2: Add camera type to getNumberOfCameras.


Trivial merge