am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."

* commit '46b9bd068ad896ba1ae8fc941c5ae172f8a520f8':
main
Jean Chalard 2013-09-26 05:24:07 -07:00 committed by Android Git Automerger
commit 68fc2ce3e9

Diff Content Not Available