tree 954855c4be35ffeb2a737ca3acc67248fef6a243
parent 570caf27d97de328e8c500bb96f917760bdc12dc
parent 98d7bd72df9833b0149dd4772cce710fa4b7476d
author Michael Jurka <mikejurka@google.com> 1349728281 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349728281 -0700

am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev

* commit '98d7bd72df9833b0149dd4772cce710fa4b7476d':
  Re-merge "Add support for custom manta cling"