tree c456f4fdb04f73aee301a696722bcf84ba749bfc
parent b40d52b89c476d6044546221035b9c720a44b196
parent 81d39be55a808acd30bea4c7297ee48d24e80b96
author Rohan Shah <shahrk@google.com> 1414958007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958007 +0000

am 81d39be5: am ad54d991: am 58df6d4e: am 22ea6504: Merge "Use ViewMode in TPL instead of manually checking conv" into ub-gmail-ur14-dev

* commit '81d39be55a808acd30bea4c7297ee48d24e80b96':
  Use ViewMode in TPL instead of manually checking conv