tree 8cbc62edd221b97a181ba805e0267d74a26ccd8f
parent 3d1a3c898e9e62587ebc72cc2bb1dc28e37213c6
parent 315c853bc69763f1262ae1830fce4ded4edb86d5
author Romain Guy <romainguy@google.com> 1350496690 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350496690 -0700

am 315c853b: Merge "Make my dreams pretty Bug #7353771" into jb-mr1-dev

* commit '315c853bc69763f1262ae1830fce4ded4edb86d5':
  Make my dreams pretty Bug #7353771