tree fd7c5d63ecb70369bf52851e3cfab1660e91830c
parent db173e81436c5b5f36e810acddf80202ac9cd633
parent 9552f9b8c2bc6d671809514cb402cbc48ee2e323
author Zhijun He <zhijunhe@google.com> 1380586181 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380586181 -0700

am 9552f9b8: Merge "Camera2: remove CameraDevice#getProperties" into klp-dev

* commit '9552f9b8c2bc6d671809514cb402cbc48ee2e323':
  Camera2: remove CameraDevice#getProperties