tree d4b01bb823e6520ee2beaa8204a4b5941ac53a49
parent f31a4cd2e543ec493610886cd535e3e95c37826f
parent f0ef23054a2311f898955178ff53a2f29ca425c9
author Vikram Aggarwal <viki@google.com> 1352334238 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1352334238 -0800

Merge "Only enter conversation mode if we have search results." into jb-ub-mail