tree bf465e8a48f74072b46a52addbb316cb5dae98cc
parent 6a372681547650d21e3b6264799cdbb4af881d09
parent 3e81ba8a7ead9b670f8f553ebcb2b51de74f51ad
author James Dong <jdong@google.com> 1280356436 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280356436 -0700

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

Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0'

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