tree af9cfbe7f8e2e09d9b8a2a9379a4a16418e38e9e
parent cf456e3c225fa736914cca1f51eb5311fa16fb88
parent 9fa364dc72613f4301b0783f0547fe6b01abac39
author Chris Craik <ccraik@google.com> 1411169780 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411169782 +0000

Merge "Account for alpha in hasShadow()" into lmp-dev