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 '5bc1d25c0962dd0e6fe00ba47c58c4737685fa42':
  Use Supported Camera resolution.