tree 363af756a6d96433f2e838563ddad1547f22f674
parent ed315827348ea496e2a8d280f743302337550fc4
parent 6da0f8d15b38d7979caf22cf5865a959358f9c58
author Eric Laurent <elaurent@google.com> 1471533559 +0000
committer android-build-merger <android-build-merger@google.com> 1471533559 +0000

Merge "audioflinger: add watchdog on main mutex" into nyc-mr1-dev
am: 6da0f8d15b

Change-Id: Ibd61b7f2d93b1eeab020d5128193652ec58a0c62