Merge "audioflinger: fix logcat" into nyc-mr1-dev