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)
commit6d52c15d4b4243778f8fe46514eb4693f507963a
treef97b8095b72e80c74ce3f4dc61321132083a613f
parent0c1e225cff3b3ba54a2de50be25943d0b71a1863
parent71438518d5d9fc0d4d1b987aab13bd5caefbcf88
am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev

* commit '71438518d5d9fc0d4d1b987aab13bd5caefbcf88':
  Allow alternative mix() implementation