tree 3d57b09636dfffde054d4eaf43a67d53d282c66f
parent f08131958534a9bb75c40d4b2c5f01d2f2511252
parent 36ec5ebe3a74d784971380baaca030940efe0212
author Hridya Valsaraju <hridya@google.com> 1488493255 +0000
committer android-build-merger <android-build-merger@google.com> 1488493255 +0000

Merge "Move android.hardware.benchmarks into android.hardware.tests" am: 533ab025d0
am: 36ec5ebe3a

Change-Id: I1694e4bf70d0886322be38d2757c2af62d9d6dcb