am 849341fb: am e0e07137: am 2494aa7b: am 5bc1d25c: am 6703fc92: am 2507dec3: am eb0ef89b: am 4967c3e7: Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a  -s ours automerge: dbdeb0f

* commit '849341fb29c4c5b44ba29ac13c14913b8b912e7b':
  Use Supported Camera resolution.