commit eedc6cb6579bec21808697d42bb705967c6b0500
author Andy Hung <hunga@google.com> Wed Apr 10 23:53:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 23:53:11 2019 +0000
tree 75f48fcf4dfe24f875b2aca546cd47e1604e453b
parent d8817bc29c8d2d0990cd8c2875190ee8e9918f42
parent e6bf186f8dcec75f5563d5ef1f57b59ec6ffdb0e

Merge changes from topic "am-99626481-1222-4690-a6c3-4a3db61755f9" into oc-dev

* changes:
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba am: 63539c399a am: d98b2019db am: a29ede5e56
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba am: 63539c399a am: d98b2019db
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba am: 63539c399a
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca
  audio: ensure effect chain with specific session id is unique