OSDN Git Service

Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev
authorChris Craik <ccraik@google.com>
Wed, 2 Mar 2016 23:55:26 +0000 (23:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Mar 2016 23:55:28 +0000 (23:55 +0000)
commit3f445f0eeea0c856916bd1170b5f09c0a3acc99f
tree38ce5680ca09559dc3c9ff92705eb980933334c3
parent8351ff25a1ef25dad69cf45431ba8aa82487bcd5
parentf6c20e4b4232e30901676bcdf1aed64801d50c7e
Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev