summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-02 23:57:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-06-02 23:57:32 +0000
commit04747534f83b21cdf5efb6bf7586b719c05be7c7 (patch)
tree82c7b26a6007744fd8b0cc5fa9472196a5ee5587
parent66f20d311e0c015cafba3d797821a67fb5c9dcf6 (diff)
parent8ccd41e2149dbdc0ad2011288386e40bc255f47b (diff)
downloadextras-04747534f83b21cdf5efb6bf7586b719c05be7c7.tar.gz
Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into android12L-tests-dev
* changes: Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev am: 74954de15a [automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours am: dad10ba78a -s ours
0 files changed, 0 insertions, 0 deletions