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

* commit '582f50f2f6d4c1cf9a7ea5da9326aea157b0db3d':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)