tree 1206e00311f5a9c8da725839a66488293c1310f1
parent e19df3dca1c8a1d9f783a6722c56f6ea82189412
parent f3de053c0a525f85f763ab9b8781ae95ef3e930e
author Andreas Huber <andih@google.com> 1284052533 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284052533 -0700

am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread

Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.