tree b0c0daa05845fd8ba7222d4fe753da9c8b705a54
parent 853cb29013aa15e2355a30d2a2a491b886105328
parent faac6eddf81106c2526bea326226c3894cf44e74
author Tim Murray <timmurray@google.com> 1381876238 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381876238 +0000

Merge "Fix blend name change." into klp-dev