tree cce92436294f460da91f9ce79fba633dc6cce413
parent 75a234244a9bc9c257f3f7ac3a6b1b34e9136da3
author Mindy Pereira <mindyp@google.com> 1330987736 -0800
committer Mindy Pereira <mindyp@google.com> 1330987736 -0800

Small cleanup.

Check for null before comparing folder, before looking at conv list
context.

Change-Id: I254bda02cb4fdbc2878ff132b82feab13bb05647