tree fbe81fb4f8fa3b4d68d237993aa3200b7681cf0a
parent b7fbb8219b85c9e553a954cb07aa9f9cfa577fc3
parent 2ebcf509f038f435ca8819dc098a7cb480bed0d9
author Michael Jurka <mikejurka@google.com> 1349657773 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349657774 -0700

Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev