tree 7a900d586456c9d20aa187eb4f37349ef5b99e75
parent 62ffcb36c93e3620ba7e53afb667be2f272d4869
parent 9961d6968e587d2791ee8db4a47a7fa012ed4a30
author Jean-Michel Trivi <jmtrivi@google.com> 1503602504 +0000
committer android-build-merger <android-build-merger@google.com> 1503602504 +0000

Merge "Audio event logging" into oc-mr1-dev
am: 9961d6968e

Change-Id: I574558660e57b56a1f38b878fac8f25c84051cd7