tree 035e0ccca6503f9f2e5265e1f0e84d2906778bf6
parent cf99ae5748c06bd8a3d4d47162c5b5b174419bfb
parent a042f4a114a5fd728fa3aa8539e377727860f1d9
author Romain Guy <romainguy@google.com> 1349678144 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349678144 -0700

am a042f4a1: Various fixes for the Colors dream Bug #7171323

* commit 'a042f4a114a5fd728fa3aa8539e377727860f1d9':
  Various fixes for the Colors dream Bug #7171323