tree 3e27791185c513b3e17acaad5109774ef6f670a9
parent 90e61d1b1e01faeb7b7495f8b38076f065c90c8e
parent 0e4803fc9585e7a3296b9341c6557513aee3eaa4
author Michael Jurka <mikejurka@google.com> 1349678518 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349678518 -0700

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

* commit '0e4803fc9585e7a3296b9341c6557513aee3eaa4':
  Revert "Add support for custom manta cling"