tree 2f428758dac330d9988ce1b1e636798d4f394557
parent 34f170f5ee724ea9589d7fb2329a966eee39761a
parent 207b3ab604bcbe47fa55f26f358cde60cf8a784d
author Romain Guy <romainguy@google.com> 1282254292 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282254292 -0700

Merge "Load assets in place instead of deferring until draw."