am 7b06c31b: am 0785ad5e: am 68fc2ce3: am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."

* commit '7b06c31b211ddfb7c57e0024c86006cd39917646':
main
Jean Chalard 2013-10-03 14:52:28 -07:00 committed by Android Git Automerger
commit 8f7d2afa71

Diff Content Not Available