diff options
| author | Kevin Graney <kmg@google.com> | 2023-10-09 11:00:19 +0000 |
|---|---|---|
| committer | Miroslava Sotakova <mirka@google.com> | 2023-10-10 15:26:32 +0000 |
| commit | f1eb926a460a9f792fa21f9c4f2b3d703ccfddd7 (patch) | |
| tree | b11e85c6debdcc1b7349a6d1556b5e185719342a | |
| parent | 0facf01f0bea505c21cb6109fb5ecea989ead38a (diff) | |
| parent | 88faeb5e14f81d8126a1199f2bc9720aded34309 (diff) | |
| download | anonymous-counting-tokens-f1eb926a460a9f792fa21f9c4f2b3d703ccfddd7.tar.gz | |
[conflict] Merge remote-tracking branch 'aosp/upstream-import' into import am: 88faeb5e14
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/anonymous-counting-tokens/+/23475197
Change-Id: I8bb8c6319898e08fbfff9a4eed65566bbf2a2fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -96,7 +96,7 @@ cc_test { "libpjc_third_party_libabsl", ], cflags: ["-Wno-unused-parameter"], - test_suites: ["general-tests"] + test_suites: ["general-tests"], } // This test times out. |