am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"

* commit 'd3c823c16100b0f24d64c99c2e8fbdd747e475ed':
main
Satoshi Kataoka 2013-03-27 22:04:00 -07:00 committed by Android Git Automerger
commit b343817399

Diff Content Not Available