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 '2494aa7b0d23b7daceeee732930fbfc2b0496251':
  Use Supported Camera resolution.