tree 6c312eac92a0437777efd876e2b74be047b0621a
parent c09bc3f7ed7f19bde6e06d742756fbc1f9bfaa3e
parent ef92ab3799cfa9d32610b943c00a1db92e5b31d9
author Daniel Xie <dxie@google.com> 1436919923 +0000
committer android-build-merger <android-build-merger@google.com> 1436919923 +0000

Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev
automerge: ef92ab3  -s ours

* commit 'ef92ab3799cfa9d32610b943c00a1db92e5b31d9':
  Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue