tree 2d909655d600222142e4a5d0c39943f59de5827b
parent 23a5cfe8b5651f2b7ac7dffe899e520f9ef9ce64
parent 502886ce6ce2f600e2ecb1f0cde6a4711c781a10
author Daniel Xie <dxie@google.com> 1456266557 +0000
committer android-build-merger <android-build-merger@google.com> 1456266557 +0000

Merge "VideoDecoderPerfTest: limit test runs if we have many codecs" into marshmallow-cts-dev am: 0ec1519c98
am: 502886ce6c

* commit '502886ce6ce2f600e2ecb1f0cde6a4711c781a10':
  VideoDecoderPerfTest: limit test runs if we have many codecs