| commit | f5d3f96001b42ff902022ebf4d97f9ab5e1f26f8 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Oct 07 13:46:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 13:46:48 2015 +0000 |
| tree | 63830b9a7f42a9f6522015cb4bb8a028b24179da | |
| parent | 235a6911b0939adc598e4135e1f1c6fcda9ff169 [diff] | |
| parent | 2a6f1d4af39a72abecf16cc0a95feda7431afc07 [diff] |
am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev * commit '2a6f1d4af39a72abecf16cc0a95feda7431afc07': ZenModeHelper: fix cross deadlock with AudioService