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>2020-06-19 16:52:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-19 16:52:23 +0000
commit5b14ecb03b1ee5b32d07922626606210aed5b8a4 (patch)
treef98b7f2f904b3baa674a5052bbcfa4a9c5c51d15 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent265cac25f7435489a63c1e5003cf9024baf88edd (diff)
parent5b63a4a89710217b5e3b9c93a427a909a247f7ac (diff)
Merge "Merge "Another setting.pkg null check" into rvc-dev am: 171f5f2857 am: 38c4e953df" into rvc-d1-dev-plus-aosp am: 5b63a4a897
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11917940 Change-Id: I42f6964c37e783b203cb99d2fbe9900d7e786e40
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions