summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 01:10:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 01:10:06 +0000
commit407c766a8b30b3c2c4111de7b61494218247e9c2 (patch)
tree0739d4d075cab5f897542b221b71d835a99d67c4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent60be88bbd4b4ddba0bdff9f6812db9ad7dbc832b (diff)
parentf306fb99575c1fc3cbcbead367366b6ed263b7c8 (diff)
Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master am: f306fb9957
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I111571106bafdec70611968c932030e200624058
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions