OSDN Git Service

am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce
authorTim Murray <timmurray@google.com>
Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)
commit893ea430c9d3f78291843e22f4370319af0b2451
tree6106458f9dd0299ef8da9aef9251e741020d8de9
parent3627907b3bfdb03c596fe01437a3fc4300ad25a1
parent31721073a7fae162a931f1d4998b12101a98916c
am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit '31721073a7fae162a931f1d4998b12101a98916c':
  Allow use of texture.