| commit | 4f42ec1d361315c0fed405c2949b780c4743fd28 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jul 15 01:28:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 01:28:26 2015 +0000 |
| tree | 8b964b729df93e5f26c85f091758f214cdbb65be | |
| parent | 9f0c649cc5e9edef733ac3611b74fc1338b96662 [diff] | |
| parent | fc09cd21622274df1655dd35cf3f0e5650241d4c [diff] |
am fc09cd21: am a36a627b: am 9581ce5e: am 02ec9974: am 944793c9: Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev automerge: ef92ab3 -s ours automerge: 451b577 * commit 'fc09cd21622274df1655dd35cf3f0e5650241d4c': Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue