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

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