am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:34:43 +0000 (19:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:34:43 +0000 (19:34 +0000)
commitb0a304e1619aaf2d5dd84aee380fc167790697c1
tree51e44fcc4b3531b95052d1db6a0df69df90c3aa9
parent9a44cbb43005ef2227bcedcf9e188bcf9039d3da
parent6d52c15d4b4243778f8fe46514eb4693f507963a
am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev
am: 6d52c15d4b

* commit '6d52c15d4b4243778f8fe46514eb4693f507963a':