am 65b3c308: am 03b912f2: am e9589df0: am ce43fc90: am 70111464: am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3

* commit '65b3c308ede69d5eaee83bc078fe1fca8d72ad99':