tree 89282e29ef7522c7d260a19fc2d67620f68d8385
parent da3eb2e6151add52e9ca12297a443831fd22e1d9
parent 867fbdb006ab8ec6cd988fcd8c42bd365060ee43
author Tyler Gunn <tgunn@google.com> 1415395432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415395432 +0000

am 6c416a97: am 7ec068d9: Merge "Conference event package performance improvement." into lmp-mr1-dev

* commit '6c416a975ea8457032cb1462faec94d5bd023966':
  Conference event package performance improvement.