tree 2ca522dd391abf917417757893ca8373124d5a98
parent bffab5cd06317a0b01faebd1e6b548a83670d44f
parent c99805c4b3d1b0f2f24a2c69a3f2d440358d3446
author Jeff Davidson <jpd@google.com> 1314216441 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314216441 -0700

am c99805c4: Merge "Fix presentation sizes for CTS video assets." into gingerbread

* commit 'c99805c4b3d1b0f2f24a2c69a3f2d440358d3446':
  Fix presentation sizes for CTS video assets.