| commit | f7c604df33467724dcf6406ca2b213a27cdb1220 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Aug 04 01:58:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 01:58:13 2017 +0000 |
| tree | f1811a8e55cc14a14034195b4e8c472390eef633 | |
| parent | 974c0855c529dfbbd9e3d837b0253c1a14d424c1 [diff] | |
| parent | 3c5628cf5aba10398e4bee6c80200aa1c13a17a3 [diff] |
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b am: fc32901189 am: 3c5628cf5a Change-Id: Id74b4cd08b495070cacbf9b1d98239c075a4ec4e