am 5557bf5b: am 10800d4b: am a024ac6b: Merge "Fix an NPE"

* commit '5557bf5ba7e33a300f35f751b7cd1916ff8e7b6c':
main
Jean Chalard 2013-04-17 19:51:22 -07:00 committed by Android Git Automerger
commit 76ffd719cd

Diff Content Not Available