tree 0a68c4795203241d1f6a7ca84921e20491609544
parent a22a6cadb24c7a5b59be322e1ce3940b14a3d753
parent 350ed8a7b7a25923ac4df75f0da8e55a865c2394
author Rohan Shah <shahrk@google.com> 1414955788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414955788 +0000

am 350ed8a7: am 79e0d0a0: Merge "Update conv item background" into ub-gmail-ur14-dev

* commit '350ed8a7b7a25923ac4df75f0da8e55a865c2394':
  Update conv item background