summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-11-09 23:27:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:27:36 +0000
commite1192c36bba870223482a9221816b8c8b0d5308f (patch)
treeb7f99b81bdfb768a4e4f8cf8bab74676b6d5addf /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2a84aae3ce9ffc8bef27e9fb900a9102a4875f4b (diff)
parent5f94201861ed12125b3eb9b4aa6c36c9abc19b15 (diff)
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -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: I03613952b67a22996c3806886765807c208f591f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions