tree 9cd528aeb893f4fa1505d5cfa4863ce936a160e2
parent aaaed7932ae955946ea8e721b5b33e8941fdf0c9
parent 8dcd596e763b70740e6bdd3cac31fedc90cb8c8a
author Michael Jurka <mikejurka@google.com> 1349904149 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349904149 -0700

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

* commit '8dcd596e763b70740e6bdd3cac31fedc90cb8c8a':
  Update custom cling params