tree 4a34c7368c58ee511b970bad02cb3a81a1e35318
parent bb0e46541ca09ffd589314c8bc8c4ecd752a6429
parent 2ff13bf01853eaabc63d6fd4a6ea7a195825d78b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578082195 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578082195 +0000

Merge "Benchmark: Remove stl and sdk_version from Android.bp" am: ef4228f9c3 am: 2ff13bf018

Change-Id: I6478be0e71a8cc32e02f6f654bac7ba189a27165