am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"

* commit 'a6c275c1390e1a69bdcf6aca1845de2a5051b49d':
main
Kurt Partridge 2013-10-03 14:54:41 -07:00 committed by Android Git Automerger
commit 2953da4fa3

Diff Content Not Available