commit | 2c36c03d86a2cf93fe0d0d6d648c913f33e9e380 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Aug 01 14:59:37 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 01 14:59:37 2017 +0000 |
tree | ebcf2d5928078fbd3b79081b86790204b2c9853f | |
parent | 8e7084533cfa502e042771ee0c5fd9fd2b3655ba [diff] | |
parent | 8e75f7437e651e101abad1b8cbc45af7555d6684 [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