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

* commit 'b0a304e1619aaf2d5dd84aee380fc167790697c1':


Trivial merge