tree ac0d3b20692edfe8d6c67d3715084a07e3977613
parent 66845a36c9eeca5296a2bf86793a5d6bedac1b36
parent c620eb7e864e5505f5a6f867223fa8e525669d0b
author Ruben Brunk <rubenbrunk@google.com> 1438618147 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438618147 +0000

Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev