tree d032180c626bf0b396acaf13167d56f58139c401
parent be3835c64dc782c1c40ebf75badd1db47aff7b1a
parent 9cc290038ca3ee06ed34d172bbd139ea13bafd1b
author Alex Sakhartchouk <alexst@google.com> 1329948645 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1329948645 -0800

Merge "Properly pipe texture names through."