| commit | 136ea31a7a988e17ec9f2d4f4f3bcfe427683362 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Oct 13 20:12:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 20:12:13 2015 +0000 |
| tree | 97d86a674d1cecec6da60dfb0ec0c2eae1e2b644 | |
| parent | 4c6e77ff8e18a1551320a6b42f6a45e19dcce748 [diff] | |
| parent | 602343bb7c64bec625a17e2a825e4d2b50f359fe [diff] |
am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev * commit '602343bb7c64bec625a17e2a825e4d2b50f359fe': DO NOT MERGE - audio policy: fix commit dea1541f