tree ad54f63a38af50af1a948bc364c59eeb2f38c43e
parent ea760b828080756fbbc24bdaa123c3b5fe9da6b8
parent 2b68a64096b2888b6e84b2763a287d0581730e5f
author Julien Desprez <jdesprez@google.com> 1633204667 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633204667 +0000

Merge "Replace GTest options by proper preparers" am: 324e661a81 am: 2b68a64096

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1843598

Change-Id: I901564240485389fd40afd7a566ce89f837f1fa3