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

author Romain Guy <romainguy@google.com>

Tue, 18 Sep 2012 22:39:29 +0000 (15:39 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 18 Sep 2012 22:39:30 +0000 (15:39 -0700)
author Romain Guy <romainguy@google.com>
Tue, 18 Sep 2012 22:39:29 +0000 (15:39 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Sep 2012 22:39:30 +0000 (15:39 -0700)
diff --cc graphics/java/android/graphics/drawable/Drawable.java
Simple merge
author	Romain Guy <romainguy@google.com>
	Tue, 18 Sep 2012 22:39:29 +0000 (15:39 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Sep 2012 22:39:30 +0000 (15:39 -0700)