| commit | ed8488149b8d842ee86b4c209d0f39d71f004146 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue May 05 13:57:18 2015 -0700 |
| committer | Tyler Gunn <tgunn@google.com> | Tue May 05 13:57:18 2015 -0700 |
| tree | d070d000fc836d00d8dcc8179867715776cc94ed | |
| parent | b040158d7bb2f5c7d06bd2c1db5e96adafbcff3e [diff] |
DO NOT MERGE Fix merge issue. When I cherry picked in cl/685115, it looks like my moving of the VideoCallFragment didn't merge properly. Removing extra instance. Bug: 20257400 Change-Id: I0194a96c1f65bda10368ebccd21165c8f2c3c217