tree eed1720d1f9198bb45bf648749bf520541453695
parent 03f41fc7262cbe04a6b5a88cb487dcd648287e99
parent ff0c4ab667ca92fed830c98604bfed7884f4f16e
author Yin-Chia Yeh <yinchiayeh@google.com> 1442352885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442352885 +0000

am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev

* commit 'ff0c4ab667ca92fed830c98604bfed7884f4f16e':
  CtsVerifier: Camera FOV: cap FOV test to 120 degree