commit 58f5458e2e22cac47be8754196dc41d529266e62
author Andy Hung <hunga@google.com> Wed Apr 10 23:53:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 23:53:27 2019 +0000
tree 67e453149ec87addcee933561a86dfa809737575
parent eedc6cb6579bec21808697d42bb705967c6b0500
parent e786ae13e38b87f65604e794fbff8f2db17e7006

Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev

* changes:
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c am: d6b2f10642 am: 426b85d639
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c am: d6b2f10642
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a
  [automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda
  AudioFlinger: Prevent multiple effect chains with same sessionId