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