tree a9f8997fa662172278aa9a23be1304b1ea1c0139
parent df482c606f1e0064486455b3c10bc5563a6b548a
parent 7258f76d52e4d15dd8e5d4abb79ad135d82fdc4f
author The Android Open Source Project <initial-contribution@android.com> 1339431790 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339431790 -0700

am 7258f76d: Reconcile with jb-release

* commit '7258f76d52e4d15dd8e5d4abb79ad135d82fdc4f':
  Remove Android specific LUMP_OF_MEMORY.