| commit | 1b8460f7dee6f4f7614bee70109181cd2067377e | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 06:29:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 06:29:18 2015 +0000 |
| tree | 2854fd73ecb422f070b50a53774721bcf695e06e | |
| parent | 1d7a3258535ed971a18cf27d8cd2b1c3822e30fb [diff] | |
| parent | 8b0bdeac672d327b26329a40b45f29281ae62938 [diff] |
am 8b0bdeac: resolved conflicts for f7e37679 to lmp-dev * commit '8b0bdeac672d327b26329a40b45f29281ae62938': Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue