am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"

* commit '395e500b0905880e59c9e1b2442b37702a0ab78a':
main
Satoshi Kataoka 2013-04-03 19:24:01 -07:00 committed by Android Git Automerger
commit e8a3e96447

Diff Content Not Available