tree b188ed449edbcc68ea5e005d033799b7f7ccec85
parent 51c865cd4fe34227b780d3b7df8b801981f747e1
parent d5d8cbf58990cde99aad017e45ef4f3fe94fbc3b
author Yang Ni <yangni@google.com> 1504125028 +0000
committer android-build-merger <android-build-merger@google.com> 1504125028 +0000

Merge "Add blueprint build for farmhash" into oc-mr1-dev am: 05a33eacbc
am: d5d8cbf589

Change-Id: Ic7c73983901cce035c13cad68c0bef7cec9802aa