tree a7e14f4a7a9ae103d97113fde64b49ace106d5ab
parent 952e6888520c21ddbff3723732253f5a1cd44b6c
parent 5695b4bb1c87a5c6ca884262f7940526ddcc5883
author Elliott Hughes <enh@google.com> 1348601612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348601612 -0700

am 5695b4bb: am f7e7ee96: am 2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"

* commit '5695b4bb1c87a5c6ca884262f7940526ddcc5883':
  Extend the maximum number of partitions from 4 to 32