| commit | 30e3c6dc1b858570b2db956551bb46aed3ee83c6 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Sep 24 13:19:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 13:19:18 2015 +0000 |
| tree | 7dffe76086f1ae0736c0860770de303f67745ad8 | |
| parent | 8410ac436e0f78e59af6d623f8d677dfb32b6324 [diff] | |
| parent | ac72dac425ae5a56899d00b8d7d266168d39ffa5 [diff] |
am ac72dac4: resolved conflicts for afb5cd78 to lmp-mr1-dev * commit 'ac72dac425ae5a56899d00b8d7d266168d39ffa5': DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService.