tree 954855c4be35ffeb2a737ca3acc67248fef6a243
parent a64478fdc28996f6145c992358f90ca66775266e
parent 75f63ee49e64abe407ac123068c6e271331e9aee
author Michael Jurka <mikejurka@google.com> 1349728427 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349728427 -0700

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

* commit '75f63ee49e64abe407ac123068c6e271331e9aee':
  Re-merge "Add support for custom manta cling"