am 807ba6e4: am a96c872a: am 8a4078aa: am 7fa4026c: am 990a9b33: am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"

* commit '807ba6e4eaf6db5f4b172948f4a6d5597829fadf':
main
Kurt Partridge 2013-10-10 00:44:29 -07:00 committed by Android Git Automerger
commit 424bd66ebc

Diff Content Not Available