tree f900a243f082a4ecf930b0e042d3ec786174bbc6
parent 1d18e69c85005698aea49509e5a587b7585985e8
parent e77277cc00e70647271395ea797e835e6152b622
author Treehugger Robot <treehugger-gerrit@google.com> 1512089956 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1512089956 +0000

Merge changes Ide2ea08f,I24186745

* changes:
  Rollback Broadcast in-call UI changes.
  Fix NPE crash on video call.