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

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