tree bec5b583c28df71f405f372e3fc988b68e6b78cd
parent 7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f
parent 2d1e5e9680dcd29628f100c172e6d7d17d90ef2a
author Elliott Hughes <enh@google.com> 1348601168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348601168 -0700

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

* commit '2d1e5e9680dcd29628f100c172e6d7d17d90ef2a':
  Extend the maximum number of partitions from 4 to 32