| commit | e41eaaee3324e60b68a06a260c26d673a455089d | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Sep 24 13:26:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 13:26:35 2015 +0000 |
| tree | 81d4426753b0dc5e42553e5880cd0c8dbf88e78e | |
| parent | 04b01dd32f4f1472fa89abc3e5da25ee1647f657 [diff] | |
| parent | 30e3c6dc1b858570b2db956551bb46aed3ee83c6 [diff] |
am 30e3c6dc: am ac72dac4: resolved conflicts for afb5cd78 to lmp-mr1-dev * commit '30e3c6dc1b858570b2db956551bb46aed3ee83c6': DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService.