tree 18537ae42b84716bc8a003f596eb4dc8950cbd9b
parent ad477fed3d696cd5e27da4d281fcff3d2a83e862
parent 2f919a49511af0b8736f6edb43d7ce579470b259
author Chih-hung Hsieh <chh@google.com> 1473708294 +0000
committer android-build-merger <android-build-merger@google.com> 1473708294 +0000

Merge "Fix google-explicit-constructor warnings in camera." am: f9ee5183c8 am: beff1fb18b am: 019e54142c
am: 2f919a4951

Change-Id: I6b20f2f0e8c2153b11b8b1e54d92db290fb7bfab