tree a6df2d3dc7a23ce7bb69d06b7abe6dbe8eb9b786
parent e5e43e9ab88bf6a9951a323ae5f804967dab4c96
parent 4d2d97763f0963d7011d04290dc87b2940aefb33
author Ruben Brunk <rubenbrunk@google.com> 1416014709 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416014709 +0000

am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev

* commit '4d2d97763f0963d7011d04290dc87b2940aefb33':
  camera2: Add READ_SETTINGS capability.