tree 785ef569e7416e4ab6d96b54c65f8c364f8dd4b9
parent c9a91cc050d9a1aa7e5a65cf104352e4be75cd25
author Chris Craik <ccraik@google.com> 1456950596 -0800
committer Chris Craik <ccraik@google.com> 1456961642 -0800

Fix merged bitmap mesh generation and reenable merging

bug:26793764
bug:26569206
Change-Id: I54628e99b61f58f5726a387ea3599c29695c0efc