diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:45:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:31 +0000 |
commit | 1a0f5accc651ce0302b88a8d496cf45733de7e90 (patch) | |
tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9fa5e9dbf454523843f8b3d0b82388c78b9ade8c (diff) | |
parent | 55311a446b70ce70c8880fc619caa3b9077ac62a (diff) |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours am: a82898ba34 -s ours am: 55311a446b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: I95ee6b20445f557fe4d00cbe5b5559a8dfba8dc4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions