tree 8a140dd2896f07f6dc5774861dd0cdcfadc0324d
parent eb79ea82ba18080d27cc086e30c4b0d4615ff977
parent 9adc436fd265534e9d940f9820dbc729cac548ef
author Rohan Shah <shahrk@google.com> 1414958006 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958006 +0000

am 9adc436f: am 4824817c: am 8503de7f: am 46b03764: Merge "Reset action bar icon on showing conversation" into ub-gmail-ur14-dev

* commit '9adc436fd265534e9d940f9820dbc729cac548ef':
  Reset action bar icon on showing conversation