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)

Trivial merge