OSDN Git Service

am d460568e: am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture....
authorTim Murray <timmurray@google.com>
Tue, 9 Apr 2013 00:10:09 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Apr 2013 00:10:09 +0000 (17:10 -0700)
* commit 'd460568ed334df054ac6551f0933e30337ae1b97':
  Allow use of texture.


Trivial merge