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

* commit '4865f81880d1b39e042b27406e725cb02866d855':
main
Kurt Partridge 2013-09-26 07:07:51 -07:00 committed by Android Git Automerger
commit e8be6f74fe

Diff Content Not Available