commit | db86989dfc569b9108249a74d85fafdcc76aefea | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Sun Aug 16 03:03:29 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 16 03:03:29 2015 +0000 |
tree | c155b3a2a95a7ab366173ac212d8e45a363bbf2c | |
parent | 57a42b672d81b9b7d9994f0f4703efff185ac906 [diff] | |
parent | 3a94b2d22e8346a884b2521f7e7682f2953d1515 [diff] |
am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev * commit '3a94b2d22e8346a884b2521f7e7682f2953d1515': Camera2: Add camera type to getNumberOfCameras.