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)
commit74a704dbb38c2d260bc68f641047f5b7fbbafd5b
tree4e2946cae76df1b855c626537a142ded9edcf6fb
parent582491bb0d77277e352bb54f7a879e76e1b259b4
parentb0a304e1619aaf2d5dd84aee380fc167790697c1
am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev am: 6d52c15d4b
am: b0a304e161

* commit 'b0a304e1619aaf2d5dd84aee380fc167790697c1':