tree fbe81fb4f8fa3b4d68d237993aa3200b7681cf0a
parent 0870de6bac41b1bd3189f4a5734208b57545c3a1
parent 914d55501146cf2c3abdf52c021b40fa789d211a
author Michael Jurka <mikejurka@google.com> 1349678313 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349678313 -0700

am 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev

* commit '914d55501146cf2c3abdf52c021b40fa789d211a':
  Revert "Add support for custom manta cling"