am 008bfa74: (-s ours) am cfa9cd0d: am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread.  (DO NOT MERGE)

* commit '008bfa744317aad92f1deb3de63f46767e97d45c':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)