commit | 733e580c2dac5713bb7490fb3a82fbabf2d00544 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Aug 01 14:54:50 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 01 14:54:50 2017 +0000 |
tree | 8125fa2fb1f8b841d66b6cfb7d671a41d8bbf8d9 | |
parent | bbde0f83cd5e28258159ae39bb851e25452cb99b [diff] | |
parent | 981b94c1bcc6ed593cb7c4cb794d0c893f59b936 [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