diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:31:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:31:33 +0000 |
| commit | 292c75a05a57b8f2021167ca4ffc165a45e11348 (patch) | |
| tree | b9f6ae549939e365cdaa9cdc8e1444bd7b56835f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | a26090c1ae457e06744c6864ec44cad85c52aa3a (diff) | |
| parent | dbf3ed5aa6ba6387ab5dbb83afc5c70d495d5610 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -s ours am: e1192c36bb -s ours am: dbf3ed5aa6 -s ours
am skip reason: Change-Id I9b242a9fee0acbfb430875061e2d809c00fe4b97 with SHA-1 ce0a50bcde is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273
Change-Id: Iaed215b30eb59479744d99e11c7f5e3478091c63
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions