am 28c7e634: am fe95e7b1: Merge "Fix possible NPE"

* commit '28c7e634264a91343e98b9e9afad2083ce9dc1b7':
main
Satoshi Kataoka 2013-09-26 05:47:17 -07:00 committed by Android Git Automerger
commit c1eccc9403

Diff Content Not Available