Merge "Set bit in blit mask to settle ambiguity" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Mar 2016 17:48:09 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Mar 2016 17:48:09 +0000 (17:48 +0000)
am: 78bda03

* commit '78bda03a6167c6697598f3f4497b4f0afb687c0c':
  Set bit in blit mask to settle ambiguity


Trivial merge