tree f4df5ee612d9a87071fa08f03c25e7105dd212f1
parent ad79342786f989a9b478be52b1a06272c28574ec
parent e91aa0fa64db892194ba82ec7d41df6fb9185471
author Romain Guy <romainguy@google.com> 1348007969 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348007970 -0700

Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev