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-02-08 05:06:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-08 05:06:42 +0000
commitad0dc8e4795bfc77f464c1d5d5c3bd7f262b0b03 (patch)
tree428274bb85930c6b9459f8cf38d1f4912b339952 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentad730d757343341f80a567350556d49e1528fcc9 (diff)
parentd1c0f8faacf4a23aa2dc2ea4260a03c07ef06035 (diff)
Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 am: d1c0f8faac
Change-Id: Ieebfcebc518768df31d3f5e23840b2279aa007d8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions