tree dba5e08f9bc21c4d92fe3d4ac1d108229fcf75b0
parent 3c04b71ce3a2c2c8bcfd98b5d8bb1e73b9bacbd0
parent dec0d823f1a2cdea7ebfaa71a4c80fea1346545f
author Tyler Gunn <tgunn@google.com> 1488164097 +0000
committer android-build-merger <android-build-merger@google.com> 1488164097 +0000

Merge "Improve parsing of conference participant addresses."
am: dec0d823f1

Change-Id: Ica133d6e5b24796c8b03c477f4ff6929092bbea1