am 6017872d: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 automerge: 6444b0f

* commit '6017872deecc26636a422bd4e050613953a4aa54':
  Adjust 480p ratio range in CameraVideoActivity.java.