tree e43914867f50feacdd56be684995f292b21c3093
parent 19b6b983b8fc496228c5f3d3e58570c8196fd388
parent efac7fdbf7c613440b857632053d21abc5b96d7a
author Chen Xu <fionaxu@google.com> 1545072675 -0800
committer android-build-merger <android-build-merger@google.com> 1545072675 -0800

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

Change-Id: Ifa619269c6781a3653b6dafc80380f1857dd554e