am 68c70e52: am 0476d729: am c11a784c: am 4a902b09: am b4d0692b: am 8f7d2afa: am 7b06c31b: am 0785ad5e: am 68fc2ce3: am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."

* commit '68c70e52d5ed60c270fb340e830fd123d5330d3d':
main
Jean Chalard 2013-10-10 00:41:16 -07:00 committed by Android Git Automerger
commit 8ca1a751ce

Diff Content Not Available