tree ce1eb6a0ff628d16623186b92e99ecc48e752a20
parent a3148b72fea1b26741b2ad05bf5ad88118e4ee1e
parent 82c0fe723c1542023fe0e61bc628b8a729be1692
author Michael Jurka <mikejurka@google.com> 1349728601 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349728601 -0700

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

* commit '82c0fe723c1542023fe0e61bc628b8a729be1692':
  Re-merge "Add support for custom manta cling"