| commit | 07dee169f4efe8f5ab10a39ebf5a41563322cecd | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Oct 13 19:06:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:06:34 2014 +0000 |
| tree | 0b6e62b680dfc31e0083e4edd7da3cfaff08c037 | |
| parent | fdb3d6d7e3e3f310db92f53d5061dcc498a00fc2 [diff] | |
| parent | 48ca08a21c162ac3d0bea070b196604ac9283408 [diff] |
am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev * commit '48ca08a21c162ac3d0bea070b196604ac9283408': Clean-up ColorFade's shaders and buffers.