tree bf07bd62ee65a1804545b039b9c421b1954aace7
parent 7d7fa82fe4adb6524763d2866087787af82ed6cc
parent e25e36ace0dbaa8faab2071bddf4677eff33a15a
author Miguel Aranda <miguelaranda@google.com> 1649671445 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649671445 +0000

Merge "Correct AdditionPerfTest to return void." am: 4e7f5518f1 am: c7c95e1859 am: e25e36ace0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059947

Change-Id: I25d820c331eaa65ff3beccf29ff43c3d1aad821e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>