OSDN Git Service

am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photo...
authorTim Murray <timmurray@google.com>
Tue, 9 Apr 2013 00:05:31 +0000 (17:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Apr 2013 00:05:31 +0000 (17:05 -0700)
commitd460568ed334df054ac6551f0933e30337ae1b97
tree6106458f9dd0299ef8da9aef9251e741020d8de9
parent0b103f1beab869563fe1100cdd592c129fa936ba
parentc443509795eff3a832f9e3be806d05cf8490cdff
am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit 'c443509795eff3a832f9e3be806d05cf8490cdff':
  Allow use of texture.