am e0e7bce4: am 2b8ba2fa: Merge "Clean up warnings in soslim" into gingerbread

Merge commit 'e0e7bce46bbb9b6a057ed9e57700dbeb3e45d8c1'

* commit 'e0e7bce46bbb9b6a057ed9e57700dbeb3e45d8c1':
  Clean up warnings in soslim