commit | ee0aae9a9bf37c12eeb347ee6f115395dbfc6bc6 | [log] [tgz] |
---|---|---|
author | Ronghua Wu <ronghuawu@google.com> | Thu Jul 16 15:24:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 16 15:24:10 2015 +0000 |
tree | 1d3170d8eb64824ddfe9539bef6513f8d3cbb0b4 | |
parent | 139694493965e2b290125bded8d234e55d6f0057 [diff] | |
parent | 94541e386359397078a65643a440aa03df464800 [diff] |
am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev * commit '94541e386359397078a65643a440aa03df464800': videoperf: specify timeout for VideoEncoderDecoderTest