| commit | eb2dcc791e649e07ec8114e00752b54965c46e65 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Dec 11 01:12:29 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 11 01:12:31 2014 +0000 |
| tree | 778bf0fffa448d4a6333fc8571b2dd74717b2551 | |
| parent | daec594370f0e47bf07d0c9c968e3c5dfedf0bb5 [diff] | |
| parent | ebd52610cfeff6e557fde284a7e1efc5e6438285 [diff] |
Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev