tree 89f9b2be5679d02669c1cebfe43276f41eabf8a4
parent 1265575d8a31f415606cccc39b24466ecae5731d
parent 76620791600af3b3d6f6ad8ba3534320265153db
author Dan Sandler <dsandler@android.com> 1426703720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426703720 +0000

am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

* commit '76620791600af3b3d6f6ad8ba3534320265153db':
  Avoid crashing on corrupted notifications.