tree 4d604896a54840006b6532546a65f55f5c4f73fc
parent ad3bc9a44e872b2db9c1e2f8ea8c1debcbade004
parent 3fec3404459e6610d4278baa6b71e261e26d0619
author Zhizhou Yang <zhizhouy@google.com> 1505295759 +0000
committer android-build-merger <android-build-merger@google.com> 1505295759 +0000

Merge "Matching benchmark directory change in soong" am: 73fd86bfc6 am: 08f098f140 am: d368bcdd5a
am: 3fec340445

Change-Id: I5af9d135873a0418480d20648b998f4e671815d2