| commit | e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Dec 11 01:23:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 01:23:06 2014 +0000 |
| tree | 99aa756317f05265102236d812f303fe943f628a | |
| parent | aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa [diff] | |
| parent | eb2dcc791e649e07ec8114e00752b54965c46e65 [diff] |
am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev * commit 'eb2dcc791e649e07ec8114e00752b54965c46e65': Don't preload textures for AssetAtlas