tree 6315dded0b2277e68769c106d39a13e76dd448fe
parent f7a93647b0242397143ba1f47f8b5342befa9423
parent 787eced198fb2b438917e205d3048fd969a8cfb5
author Brad Ebinger <breadley@google.com> 1486507055 +0000
committer android-build-merger <android-build-merger@google.com> 1486507055 +0000

Merge "Perform camera permission and app ops check when setting camera for VT." am: e0a6ed95d8
am: 787eced198

Change-Id: I025aa2ecdf9d93a9b27e7d2bd1d781a0e62ed90e