tree 94dec57a34802883238c44687f232a1ff1a0fc86
parent 6a9fb9433306cbc3d0e1be3968729589f3218c65
parent 4c09901931c29ea014c9cc64e431475809495160
author Tyler Gunn <tgunn@google.com> 1518571484 +0000
committer android-build-merger <android-build-merger@google.com> 1518571484 +0000

Merge "Rename Conference#setConnectionElapsedTime to clarity." am: d1134525fc am: a0b41a82ce
am: 4c09901931

Change-Id: I493ade2029398983a76fd41fcf9f080ee2f06b95