| commit | bccc13cccc2b5a534b5b4cdf62c7be20edaef046 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Nov 14 17:24:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 17:24:45 2014 +0000 |
| tree | 2416cd6157e0f853b435412245e5eedb8be1fed8 | |
| parent | e3b8ad15649d09d8b111d35b3b1a31fcda844714 [diff] | |
| parent | debc2a5fb358bc8af5734aa0c7114b6ca38d28b4 [diff] |
am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev * commit 'debc2a5fb358bc8af5734aa0c7114b6ca38d28b4': add tests for stream type check in audio policy binder.