commit | 12f6a11de637406a066c532a07f9d4466a652af0 | [log] [tgz] |
---|---|---|
author | Eric Laurent <elaurent@google.com> | Tue Nov 04 03:16:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 03:16:23 2014 +0000 |
tree | 9cdd994a0c078f16b3a9262403925f90fea485c4 | |
parent | f2764dd42173939ac5fddf1d1b0b96083df0843a [diff] | |
parent | 8e264a7703c79fff52dedcd867b9f134d93199f6 [diff] |
am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f * commit '8e264a7703c79fff52dedcd867b9f134d93199f6': AudioService: fix cross deadlock