tree 270db9cda217145fd22f18ca22c81ce69a38dd72
parent 8b699927179a213edd7009a9a28892d6f713ccff
parent 201f9b8d49108ca9ab8c98a4b3fa578aa0bbc217
author Chris Wren <cwren@google.com> 1399585847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399585847 +0000

am f8e933f9: am 2dc97d48: am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE"

* commit 'f8e933f9882e7ee627c7189e4ab650a20531e58a':
  Avoid SystemUI crash due to NPE