tree d4d4a0d2c3b83b1a2b958f971208bb87772c72b8
parent b040614889f2cf58afd7d492c1305ee4c11d5ed2
parent d06583d70ada62d484be5a578e06a6b190cedd46
author Daniel Xie <dxie@google.com> 1442955822 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442955822 +0000

am d06583d7: am 7b25904e: am a7905174: am ebb571ad: am 548c7761: am 00e9fb1e: am d944510f: am 079c1249: am d8aae7a8: am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1

* commit 'd06583d70ada62d484be5a578e06a6b190cedd46':