tree 4f23359e87a1bb079bd499f922d763e45c7a8752
parent 934d8d85be221b86cb5097625c0f48391b3a71b2
parent e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7
author John Reck <jreck@google.com> 1418261154 +0000
committer android-build-merger <android-build-merger@google.com> 1418261154 +0000

am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
automerge: e4a6ed9

* commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7':
  Don't preload textures for AssetAtlas