am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"

* commit 'ff6a55812cc28a42bc1b2f331800b6824039bc00':
main
Satoshi Kataoka 2013-09-26 07:08:20 -07:00 committed by Android Git Automerger
commit 9b91243f4a

Diff Content Not Available