| commit | 89eb9029c5730afd406e0a8451157eb99b7b0d2b | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Jul 28 23:49:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 28 23:49:03 2017 +0000 |
| tree | ae7949b70413ded6759a8cddbc7cbd3fa257cfed | |
| parent | 469c122bf02f34df76a8f47466bb0b8bf27901a1 [diff] | |
| parent | 8a42fc27f8f0188636632a339061fdf6af573a67 [diff] |
Merge "media: limit duration of VideoEncoderDecoderTest" into marshmallow-cts-dev am: 43f81de4d3 am: 26ca02964e am: 8a42fc27f8 Change-Id: I90c519976d14fda55edae5e4f7c738feb5ebbdd3