tree a4806fca16d22780237a4c61b14638afdd508586
parent 5ad9b52148740b984509183fe3ecb9d8d81c702b
parent a433be70632e02e32dfc2e26f03e7cabb7f0e208
author Michael Jurka <mikejurka@google.com> 1349903889 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349903889 -0700

am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit 'a433be70632e02e32dfc2e26f03e7cabb7f0e208':
  Update custom cling params