| commit | eccbfedf14cdb8bf5d5e4756f9221aaba607c954 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Aug 01 15:03:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 15:03:38 2017 +0000 |
| tree | 2f86b449543e2ac4d0d42765da96a3eade966e0b | |
| parent | 2710254d7d33885e108df7c1f949eba4467b043c [diff] | |
| parent | 79bc90e7ffd248a222c8c4abe226ebc0bbdd12f7 [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 am: 79bc90e7ff -s ours Change-Id: Icab153319c6b122f34d3f3b4cb0b6dc467ef4d6c