tree eecfe77055d79bd6acfc1db4fb42e554fe9a6c8a
parent 21524818b65cf04a1c7741d14072f0b34e67edad
parent b53a96c76c005760beb083ca527f8a7de1b97aa9
author Tony Mantler <nicoya@google.com> 1414957924 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414957924 +0000

am b53a96c7: am 832e3827: am 8d0007bd: am 272d40fb: Merge "Avoid crash when tagging people in notifications" into ub-gmail-ur14-dev

* commit 'b53a96c76c005760beb083ca527f8a7de1b97aa9':
  Avoid crash when tagging people in notifications