| commit | 81576ca12a6f401d2c8072293cd1509526cb9299 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Aug 04 01:58:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 01:58:34 2017 +0000 |
| tree | f1811a8e55cc14a14034195b4e8c472390eef633 | |
| parent | f7c604df33467724dcf6406ca2b213a27cdb1220 [diff] | |
| parent | 34526d6ad40829f384de08c344c46030551eed2d [diff] |
Merge "Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b am: ddc0123df7" into oc-mr1-dev-plus-aosp am: 34526d6ad4 Change-Id: I213ac610ae8fadc01157b4708652b8b006613e4d