tree 6c0ef74b82e28fc0e2e60680289489d4e2283e7a
parent 2454b862c858fc9e575f63f7c7206d520ecf3630
parent bde5acd3a31b19a73e6877309ce3de27b211855a
author Eric Laurent <elaurent@google.com> 1467250735 +0000
committer android-build-merger <android-build-merger@google.com> 1467250735 +0000

Merge \\"audioflinger: fix logcat\\" into nyc-mr1-dev am: bb3bee86d5
am: bde5acd3a3

Change-Id: Ie443e96b8231b3fff5773253e7886fe7f5c42150