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