am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 1 Jun 2015 17:06:40 +0000 (17:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:06:40 +0000 (17:06 +0000)
* commit '71438518d5d9fc0d4d1b987aab13bd5caefbcf88':
  Allow alternative mix() implementation


Trivial merge