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

* commit '5cc606aca6e5fc8848f7b1e69a97bfaaaae93f93':
main
Jean Chalard 2013-09-26 05:54:53 -07:00 committed by Android Git Automerger
commit 6554f4d754

Diff Content Not Available