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

* commit 'c1eccc94035edd394f998ce5f0e94eb599d7c6b7':
main
Satoshi Kataoka 2013-09-26 07:08:50 -07:00 committed by Android Git Automerger
commit d0fb2b4164

Diff Content Not Available