tree 50f35f10fc25dace14f976faeb5d23f7a1743b4b
parent 28efe25149cf4ba084146fd1b3cbf9504fcd2dc3
parent e1a991476365cf1a8249c842e2b936db6940b0a7
author Xavier Ducrohet <xav@google.com> 1263947672 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263947672 -0800

am e1a99147: am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair

Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7'

* commit 'e1a991476365cf1a8249c842e2b936db6940b0a7':
  ADT/Layoutlib: 2 color, linear gradient support.