am f61ff3af: am 13b32ee1: am 368427e2: am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"

* commit 'f61ff3af4dfb22df000d0d8776b4c471f5760ba1':
main
Kurt Partridge 2013-05-15 10:51:27 -07:00 committed by Android Git Automerger
commit e7386e1540

Diff Content Not Available