| commit | 480f0ca9c314d880aba07b583c5e9d05d3639ed5 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Oct 13 20:03:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 20:03:10 2015 +0000 |
| tree | ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 | |
| parent | 1231bdbe2465ecba886c446d2f682716b59d3186 [diff] | |
| parent | 9d1bc9f252edae3a31decf5c18e971c6ab424b26 [diff] |
am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev * commit '9d1bc9f252edae3a31decf5c18e971c6ab424b26': DO NOT MERGE - audio policy: fix commit dea1541f