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)
* changes:
  Add target to texture
  Use Bitmap in Texture.upload


Trivial merge