tree 870c08be795c5b498f97d15722f5c78edd2190f6
parent d5d2c757eb6de1685878fb49a9f0e4575e32fe4f
parent d6b516024f2ca43d9760da8b73046c72f77c6500
author Tyler Gunn <tgunn@google.com> 1440454180 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440454180 +0000

am d6b51602: am 495cf68d: Fix concurrency issue when processing conference event packages.

* commit 'd6b516024f2ca43d9760da8b73046c72f77c6500':
  Fix concurrency issue when processing conference event packages.