tree 93270b1a2e65a40ff3dd5906550529e3018b8266
parent 6020c6e76711a0f950cf528601bb500ff4869ff2
parent 495cf68d2426766bba0016db975925f898e23cf2
author Tyler Gunn <tgunn@google.com> 1440453720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440453720 +0000

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

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