tree e652f2698ee8d989be6b68111939fb6ab0347202
parent 6062a09dbc1c26cacb6fa2dac7467ae826b70229
parent c5b5f0556b542a22f01d254e6284f69e9eb23e74
author Chris Craik <ccraik@google.com> 1412278087 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412278089 +0000

Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev