commit | 79bc90e7ffd248a222c8c4abe226ebc0bbdd12f7 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Aug 01 14:59:54 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 14:59:54 2017 +0000 |
tree | ebcf2d5928078fbd3b79081b86790204b2c9853f | |
parent | 2c36c03d86a2cf93fe0d0d6d648c913f33e9e380 [diff] | |
parent | 733e580c2dac5713bb7490fb3a82fbabf2d00544 [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: 6f03f590c0 -s ours" into oc-dr1-dev-plus-aosp am: 733e580c2d -s ours Change-Id: I925ec56182effef98eeaef52e151601769bda86b