am 33504771: am 6d52c15d: am 71438518: Merge "Allow alternative mix() implementation...
authorPyry Haulos <phaulos@google.com>
Mon, 1 Jun 2015 17:49:59 +0000 (17:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:49:59 +0000 (17:49 +0000)
* commit '3350477113b5d1764b2b54049b09e8b78e5da112':
  Allow alternative mix() implementation


Trivial merge