tree a4806fca16d22780237a4c61b14638afdd508586
parent 47cbf10880d96d04b78bfceec72584717f62cc30
parent 37b2bac33e90411f2bfd0ee1117b595dcc2b50d5
author Michael Jurka <mikejurka@google.com> 1349904026 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349904026 -0700

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

* commit '37b2bac33e90411f2bfd0ee1117b595dcc2b50d5':
  Update custom cling params