am e40d6752: am 6554f4d7: am 5cc606ac: am 8d46ea91: Merge "Fix some warnings"

* commit 'e40d67521294bdcc32d02fa817dbaed54da9271f':
main
Jean Chalard 2013-10-03 11:52:32 -07:00 committed by Android Git Automerger
commit de6e35bc48

Diff Content Not Available