| commit | edc121c249d2b3f3ba2f3816957252e756458ccf | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Tue Sep 09 00:04:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 00:04:27 2014 +0000 |
| tree | 111a972ba6bff083a7f06a6eca094f48b2bac0e7 | |
| parent | 6371ab64cff0cec108b47079cf6865a15be6e286 [diff] | |
| parent | f3e2a0b9530b5406277ba21ac4bb87d968e3ab73 [diff] |
am 63fe87ff: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev * commit '63fe87ffece32b234323322621467b6bbb3b1b6f': Don't track TextureLayer lifecycles in RenderState