tree 39b9353e3a4d7438e13d4032c1a0d41eb55987b3
parent 7cbd93016b65febf829468b6981f343414ef0da2
parent 2257fe8a7597c3a0133514691ac872c2b6ac3dc5
author Tyler Gunn <tgunn@google.com> 1414726772 +0000
committer android-build-merger <android-build-merger@google.com> 1414726772 +0000

Merge "Creating connections for conference event package participants." into lmp-mr1-dev automerge: 450f904
automerge: 2257fe8

* commit '2257fe8a7597c3a0133514691ac872c2b6ac3dc5':
  Creating connections for conference event package participants.