| commit | 4d4b3aa3d969fdf0d2654181b820e128087fe085 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Sep 19 23:56:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 23:56:46 2014 +0000 |
| tree | 4fe2de4c99034a4c1e949b5a9a50258aff355a64 | |
| parent | a57901c5fb11bb1600b7e3de54c73504787cf0f6 [diff] | |
| parent | 746c441d4b525584d2233fdc8687ee77579bd8d5 [diff] |
am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev * commit '91a40be04f8d1822c27888cc47124bf965633f4f': Account for alpha in hasShadow()