Commits
Eino-Ville Talvala authored and Android Git Automerger committed 7c0ed29ee1dM
am c964884e: (-s ours) am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev * commit 'c964884eb73cd1c903809bfa3393fbf51f38a133':
Showing diff tof4c6e3b9f2e