Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev
automerge: c282df3

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