| commit | fc09cd21622274df1655dd35cf3f0e5650241d4c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jul 15 01:25:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 01:25:50 2015 +0000 |
| tree | 0722f69cdc482cdb97fa4503eba85f7ba89c6a66 | |
| parent | 5726f084060e1a4ec4814f94c9720428627580f7 [diff] | |
| parent | a36a627bcdee91923b11d61415c877b9afb1c764 [diff] |
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 'a36a627bcdee91923b11d61415c877b9afb1c764': Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue