am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"

* commit 'de51abf1cfa0aea19d82cae69ea9bad2338d6d3a':
main
Kurt Partridge 2013-04-17 19:46:23 -07:00 committed by Android Git Automerger
commit 368427e25f

Diff Content Not Available