| commit | 2425efab83199a21f28b4d0b4183675beb37a844 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri May 23 23:25:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 23:25:27 2014 +0000 |
| tree | 740967f842f83e08f94e955e92508fcc066da673 | |
| parent | 6000a6c663467809cd89bb4e98b4e112553819da [diff] | |
| parent | cd3a8245489fa36c528b075efe99a147cf4f6785 [diff] |
am dcdd43b6: (-s ours) Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev * commit 'dcdd43b62eacb2988b5621456b941d47500e830c': DO NOT MERGE Inspect SkShader to determine hw shader.