tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent 2e0ec5e291b84c5a64856a8326b724114ac2f1d5
parent 6ad4222d3c833394574b85c8408bdb46ad5d43dc
author Carl Shapiro <cshapiro@google.com> 1294877336 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294877336 -0800

am 2ce1fb3e: am 55fa6d07: Merge "Remove the allocation limits interfaces." into honeycomb

* commit '2ce1fb3e40dbb939280dd8058b084b5b7246cb7d':
  Remove the allocation limits interfaces.