OSDN Git Service

Merge changes I94b1c31c,Ib0b16c87
authorSergei Vasilinetc <sergeyv@google.com>
Fri, 28 Oct 2016 01:30:56 +0000 (01:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 28 Oct 2016 01:31:00 +0000 (01:31 +0000)
commitfda66672fedf73d08d9061a2823ec7bd2c9cd774
tree8d282f341cc6aa6cedf466516a4e52aac68f5b14
parent42875e6cf6e93a825a0f998a269968fdfd22dfd8
parent2a38c42e921451abebb4ee5f5ecd738f1b6b04ed
Merge changes I94b1c31c,Ib0b16c87

* changes:
  Add target to texture
  Use Bitmap in Texture.upload