am 0486b377: am 0dbae774: Merge "Avoid an NPE"

* commit '0486b377e74d592b722d2d490be34c8514781055':
main
Kurt Partridge 2013-09-26 05:46:43 -07:00 committed by Android Git Automerger
commit 4865f81880

Diff Content Not Available