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

* commit '6554f4d75401bd13ca740f80d9bfee26aa46f0e9':
main
Jean Chalard 2013-09-26 07:39:09 -07:00 committed by Android Git Automerger
commit e40d675212

Diff Content Not Available