tree 215ac116cd54ddaf48c572fe2a357ca6f5d44059
parent 2c02789d37f19a601311d2cbb496d36abccbf21f
parent a1079194649f48af827eb879e32af661d716116f
author Tyler Gunn <tgunn@google.com> 1414618412 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414618413 +0000

Merge "Communicating participant changes to conference controller." into lmp-mr1-dev