| commit | 1c61b7ddf33c6b493b32d7146f6778779247f9e0 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Dec 17 00:15:21 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Dec 17 00:15:22 2016 +0000 |
| tree | a582b8142e69a77ca975018c5c0268436f84f2a4 | |
| parent | 8d8125714f07598c8557fcdf0f2540d39c07cb00 [diff] | |
| parent | 3b50c3214607ea080aad68bb2ce5d4746f1b61e3 [diff] |
Merge "DO NOT MERGE - audioflinger: fix recursive mutex lock in EffectHandle. am: 31a4598a19 am: bc9bdb3b3e am: ef4c260b0b" into nyc-mr2-dev-plus-aosp