tree b5c40d56ab92663380eae9ffe3c4d6e1de23e967
parent 10f7d1ad1376d84304e4e0b6515124b34a2c4776
parent c8abe0f653e6f1e14fc9d9fd888af4b8c5cf2860
author Brian Muramatsu <btmura@google.com> 1333756018 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333756018 -0700

am c8abe0f6: am 2f181a15: Merge "Fix testVideoSurfaceResetting for Landscape" into ics-mr1

* commit 'c8abe0f653e6f1e14fc9d9fd888af4b8c5cf2860':
  Fix testVideoSurfaceResetting for Landscape