tree d2535e1f6647bbc3069c5415e2da8c3e57887446
parent a310f87ffaed54a47ec1780adcaf64fb48c65091
parent 610673690c4a91afbc8f6d81e8aa80667d683316
author Chen Xu <fionaxu@google.com> 1545071920 -0800
committer android-build-merger <android-build-merger@google.com> 1545071920 -0800

Merge "public API for VideoProfile.CameraCapability with zoom"
am: 610673690c

Change-Id: Iead5b876acbc2591f3074c0d0829ca13cf44d6e3