| commit | 7bafd606eb2390574f0a2b0043074d9cdfde1120 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Wed Sep 09 23:56:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 09 23:56:01 2015 +0000 |
| tree | 00a13e22f6cd11965b1ff24c0c7c1e35f1912eac | |
| parent | d8cf2c928dd00456a5d4f458510aecf2d265db94 [diff] | |
| parent | 8b09ba805dff7595d448e9816705d1288e2f8e73 [diff] |
am 8b09ba80: (-s ours) am 0a4b92df: am ee1c50d7: (-s ours) Merge "DO NOT MERGE AwesomePlayer: Separate cache buffer watermarks for offload audio" into cw-d-mr1-dev * commit '8b09ba805dff7595d448e9816705d1288e2f8e73': DO NOT MERGE AwesomePlayer: Separate cache buffer watermarks for offload audio