tree 035e0ccca6503f9f2e5265e1f0e84d2906778bf6
parent 869a3e060906ad9b2766e5d90e085757fa6747e6
parent d4378258e785bacc6a41f182a43344c7b9dd59e7
author Romain Guy <romainguy@google.com> 1349678632 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349678632 -0700

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

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