tree 954855c4be35ffeb2a737ca3acc67248fef6a243
parent 6c5679e5ddbac06d555f1242a2cf082deb71de21
parent 45355c4596f396d7e7247e91de850646356bd104
author Michael Jurka <mikejurka@google.com> 1349728164 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349728165 -0700

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