diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 03:00:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 03:00:37 +0000 |
| commit | 075e0109208897578f6b1436e4bb75da1032d221 (patch) | |
| tree | bd116ec6cf8216fd61ecddbd45aac712a8f15c01 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 16ab7af5d9d7c9711da76c1bcb64bbec27b037df (diff) | |
| parent | 5fa9d66f1c4075a4cb3a62bf2e109c36bd0c2c37 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours am: 343b788472 -s ours am: 94fc18f36c -s ours am: 5fa9d66f1c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285
Change-Id: I9b6f1fd5dbb142341967d633de79bafb716eccc7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions