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)
* commit '31721073a7fae162a931f1d4998b12101a98916c':
  Allow use of texture.


Trivial merge