summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-08-24 21:14:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-24 21:14:27 +0000
commit3eefb806649b7757a300c54a1d969b0602c64c61 (patch)
treeaee5a605d7e32f78b0335abca10f7ec856f18cd5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbf4895a2ef8f0e973e91fdbd04cc12740df281fa (diff)
parent8940f104023d8795903dd7fb7077cebe300f52ce (diff)
[automerger skipped] Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df580193 am: 8940f10402 -s ours
am skip reason: Change-Id I719e44a29a54ee886e5d3a7180fd3ad9a7dff599 with SHA-1 d562b1bfdf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383606 Change-Id: Id449dbc3b353d53eae2114aff99ea1069a5790a1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions