tree b188ed449edbcc68ea5e005d033799b7f7ccec85
parent 3427951e84d6a2e1fd0912e2270f7f163c26a28b
parent 05a33eacbcd5220e4ace7f249cfe48c2eb792557
author Yang Ni <yangni@google.com> 1504124138 +0000
committer android-build-merger <android-build-merger@google.com> 1504124138 +0000

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

Change-Id: I1946eb38f42f3d1731d16ed48dd37adb8382079a