am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"

* commit 'a1cd79708f0b093de0f2c297e20e749bdcbad36c':
main
Satoshi Kataoka 2013-04-10 19:40:46 -07:00 committed by Android Git Automerger
commit 4b24e49b11

Diff Content Not Available