am 9e45aaac: am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a  -s ours

* commit '9e45aaacf1b6e11243dc5e8193b47e0d405fcb4f':