| commit | 2710254d7d33885e108df7c1f949eba4467b043c | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Aug 01 15:03:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 15:03:11 2017 +0000 |
| tree | 2f86b449543e2ac4d0d42765da96a3eade966e0b | |
| parent | 621082d93c61d73bfdea07cfdbc31633bcb3bd02 [diff] | |
| parent | 2c36c03d86a2cf93fe0d0d6d648c913f33e9e380 [diff] |
Merge "DO NOT MERGE ANYWHERE GenericSource: still feed audio decoder when paused. am: 72feab63b5 -s ours am: 76945790ac -s ours am: 36dc8cd573 -s ours am: cab827ee4b -s ours am: bbde0f83cd -s ours" into oc-mr1-dev-plus-aosp am: 2c36c03d86 -s ours Change-Id: I18aaf714d0558539176e65572b124bdafc77de70