tree 807f4f3fc4a792446a9d2905ae30bbcafa8e803a
parent 40f0e35c1dfef812084a68f5ccb4083b572718aa
parent ff4a7fa411401910e6e5ac88aeb6e0080a8cc8b1
author James Dong <jdong@google.com> 1280356269 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280356269 -0700

am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread

Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp

* commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d':
  Eliminate the linear cost associated with mSampleSizes.size()