summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorCalvin Pan <calvinpan@google.com>2021-02-05 01:53:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 01:53:21 +0000
commit6362783d8c149b2f60806791d5b30ff5648e549e (patch)
treeba48dffbb410f129ef7ba17dae141947207ee3bf /tools/aapt2/java/JavaClassGenerator.cpp
parentd8d235dd290d515c8693243188826265644d02a2 (diff)
parent1285ab52ceae1b2596287924978a795e08896bc1 (diff)
Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I117abe342c7928f287c7a5f3f947b32e5da6678e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions