am 6fa1ea7d: am 949baa53: am 0d8dcd5d: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733

* commit '6fa1ea7db4d88cb7302b07e7bb66b52dea0565a3':