tree 02404c81a609919d1427102bed95e6653c220cf2
parent ee19db4ff1dfe0d83032bee5f2c9b50e6212b302
parent 67d727d98f6af9cb310fb140fdbc186cac646c30
author Daniel Xie <dxie@google.com> 1456270190 +0000
committer android-build-merger <android-build-merger@google.com> 1456270190 +0000

Merge "CTS-5.1_r3 : Fix testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: 42509829fb  -s ours am: 62c8423142 am: 8dd9ee84d2 am: f6b32e7b61 am: 6c63a8e6bf
am: 67d727d98f

* commit '67d727d98f6af9cb310fb140fdbc186cac646c30':
  CTS-5.1_r3 : Fix testBadSurfaceDimensions