| commit | 8a42fc27f8f0188636632a339061fdf6af573a67 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Jul 28 23:42:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 28 23:42:42 2017 +0000 |
| tree | d4ba7d2f661616b5f3f5e14d51d2219f5c53e940 | |
| parent | be30ef78354d5056bf42024841e4da7156438e74 [diff] | |
| parent | 26ca02964e1fd1fb086916f1ce121df0fbcdad34 [diff] |
Merge "media: limit duration of VideoEncoderDecoderTest" into marshmallow-cts-dev am: 43f81de4d3 am: 26ca02964e Change-Id: I3a5a8d0e832ee565421d73368169408b6b52db03