tree 07dada45e98b0b0f736f475c2629adcc94a68fa6
parent f50bdc382ae2d7d077933d579d9eb1afe7c31209
parent 1055dbe46927b1dfab84a08550f1fa3a09bf84cd
author Ruben Brunk <rubenbrunk@google.com> 1438620343 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438620343 +0000

am 1055dbe4: am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit '1055dbe46927b1dfab84a08550f1fa3a09bf84cd':
  Make vendor keys visible in Camera2 java APIs.