tree 37d788e1ee8373290fa0a1f009f71135e02b6f9a
parent a80508efcacf4a3a74713b9af6d401b79d2d1374
parent b4edaf1c5ff88460e4b3d8161e390567ce4cef34
author Tyler Gunn <tgunn@google.com> 1414725415 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414725416 +0000

Merge "Creating connections for conference event package participants." into lmp-mr1-dev