| commit | 72148b11b5db118821783c5ace7c7dffa394a5c5 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Sep 24 17:20:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 17:20:43 2015 +0000 |
| tree | 18980e5d57a105c372aa43317834f93177229c65 | |
| parent | 134450444a4660d84220a13e5d991fbfa485dd53 [diff] | |
| parent | e41eaaee3324e60b68a06a260c26d673a455089d [diff] |
am e41eaaee: (-s ours) am 30e3c6dc: am ac72dac4: resolved conflicts for afb5cd78 to lmp-mr1-dev * commit 'e41eaaee3324e60b68a06a260c26d673a455089d': DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService.