summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJordan Liu <jminjie@google.com>2021-01-26 00:05:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-26 00:05:48 +0000
commitb5dab8575311f9ea7f42f5d255461c64e51ce977 (patch)
tree7774ee9bab48244a370900173b00ad095e2f7253 /tools/aapt2/java/JavaClassGenerator.cpp
parentc819062e8cf949dfd79f7751380bbed0f355e001 (diff)
parentb24ba046eeb71e9ec1b4151ce0b1a9f889d26903 (diff)
Merge "Add carrier config for carrier key" am: 11dff58d5e am: b24ba046ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8508d94fe93bca5034259926a7c60a05d6bc2990
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions