am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"

* commit '2fa14bc54d7848224519294bb1b721f5764176a1':
main
Satoshi Kataoka 2013-09-26 05:46:59 -07:00 committed by Android Git Automerger
commit ff6a55812c

Diff Content Not Available