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

* commit 'e8be6f74fe698e23360b7f6d42f264ae1c23fe13':
main
Kurt Partridge 2013-10-03 11:40:52 -07:00 committed by Android Git Automerger
commit a6c275c139

Diff Content Not Available