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

* commit '68fc2ce3e94bc870924c9aae9aaab58b391c4d93':
main
Jean Chalard 2013-09-26 07:03:53 -07:00 committed by Android Git Automerger
commit 0785ad5e23

Diff Content Not Available