| commit | ca6eec64201158e4cca203ff03510f32d7bbeec9 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Aug 04 01:52:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 01:52:14 2017 +0000 |
| tree | 395fb39e771caed9b1787ef8c9b1bbaea5ca0a6f | |
| parent | dc94465312fa35e79dc5eca95f4eb4f5762ef5ad [diff] | |
| parent | ddc0123df747c3911da9e25645d892e92319c10b [diff] |
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b am: ddc0123df7 Change-Id: If9acf119da973d81cdca451a8f6be24fd591fdf7