summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-11-09 23:28:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:28:38 +0000
commit98d40c621e8d6fa1053287cbe4aaa7cb8407de64 (patch)
treeb9f6ae549939e365cdaa9cdc8e1444bd7b56835f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf566c3611e5088e3756d3bc9efca554ce4add683 (diff)
parentfc7b7755cab992e670ab92e40a9078c385a44458 (diff)
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours
am skip reason: Change-Id I1241a12eafa0bdbac59a8ddd4cf6a0637d467b19 with SHA-1 1ba154b14d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868 Change-Id: I0855583d84b4c299f7a062a9afeda7392fa257ce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions