tree 9da0cd71431f31af5fe560a37fe14619e539527a
parent a99dd2c94448efc246ee2326912532f20bb38311
parent 1017f9862fb2cdfbff0abe12ef7d20b657a38e36
author Eino-Ville Talvala <etalvala@google.com> 1439688882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439688882 +0000

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

* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.