summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-09-23 02:36:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-23 02:36:53 +0000
commitddb7e18e4f041650dd2c81684fe2880bc8f82847 (patch)
tree19cdbb5f14169d7189d04ea2d498f782814aaa2d /tools/aapt2/java/JavaClassGenerator.cpp
parentabefd806d059aa46a897642d6f63f9cda1b7789d (diff)
parent6614e2ef662aecd9431b7344b0f0b766c125aa94 (diff)
[automerger skipped] Merge "Add DisplayContent#forceDesktopMode" into rvc-qpr-dev am: 322120364a am: 6614e2ef66 -s ours
am skip reason: Change-Id I6ec52b6b1642fd547ebc222ae1bf9a2958e5fb2d with SHA-1 1e00756d34 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12628223 Change-Id: Ie72bb67e2849604168e49f9df85946b9bc133c8f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions