am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
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()

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base