am 7d5a4faa: am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1"

* commit '7d5a4faacecda23d6d7c7c8c622c34dd4fc90457':
  Fix warning compiling samples with clang3.1