tree e211b2fda75b0defc65a8add292e36729b72ca8a
parent deabb9030b65b73e937976e9187fd0ddcbf79317
parent 55653cc33bb4ade9441d928540b9486029f6616f
author Colin Cross <ccross@android.com> 1468530683 +0000
committer android-build-merger <android-build-merger@google.com> 1468530683 +0000

Merge \"Convert bionic benchmarks and tests to Android.bp\"
am: 55653cc33b

Change-Id: I577eb6db457bfbc520ca4528315715674173c489