summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJames Mattis <jmattis@google.com>2021-03-05 22:11:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-05 22:11:25 +0000
commita5e243419a90e09568d8eb0f999c94eb85bd51b5 (patch)
tree3f89f9dec3f3cb3092c5d87a80ee1546d36e50dd /tools/aapt2/java/JavaClassGenerator.cpp
parent77229abe612243db0be75f941e1d2b1a10c0a44c (diff)
parentb6625e597602c7ba3754f21bc4eeadec6d02f22f (diff)
Merge "Applying OEM network pref to all users" am: c1a548b132 am: b6625e5976
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ec8289855a810504e82b8828a4160929f13d19b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions