| commit | 7f8040a80472b86c358f4b28ca7ec938d7fbed00 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Nov 18 22:30:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 18 22:30:03 2014 +0000 |
| tree | 8dbc8750ee94edf7a6a21446138b94d668bb5342 | |
| parent | 86b7699875992c3cc442c0ffa37ed990080b221e [diff] | |
| parent | 0acbed256eaadd3e704942405d130729d3366534 [diff] |
am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev * commit '0acbed256eaadd3e704942405d130729d3366534': Use stream type if set by user