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