am 56e870e0: am 9ef5cda3: am 28886e99: 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 '56e870e07d7b4e244be27b0fb34e8dba0789d9d6':