am def41bb3: (-s ours) Merge "DO NOT MERGE - audioflinger: fix deadlock upon...
am def41bb3: (-s ours) Merge "DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error" into lmp-preview-dev
* commit 'def41bb3':
DO NOT MERGE - audioflinger: fix deadlock upon AudioRecord creation error