| commit | 9eea9b8009182c64871e8b0a34d69a580d4a7dbf | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Aug 26 15:21:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 15:21:15 2014 +0000 |
| tree | 285d8d59635ba55ddb6e3afa9f8e10f717a04c65 | |
| parent | 9068981ae19d9036057af97a3f12ad6704877c6e [diff] | |
| parent | 7dd9776fa82ff86d4086a3ba61b57f0db00ae560 [diff] |
am 8404617e: (-s ours) am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev * commit '8404617ed22ef52cc2403b154578a6ebc4cf50a4': DO NOT MERGE Copy shaders