am 21f21877: am 9b91243f: am ff6a5581: am 2fa14bc5: am f6a1a765: Merge "Fix a possible NPE"

* commit '21f21877db1950c66af0edfecec6087d5cf91d86':
main
Satoshi Kataoka 2013-10-03 14:55:01 -07:00 committed by Android Git Automerger
commit 8452422ba1

Diff Content Not Available