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-04 03:18:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 03:18:05 +0000
commit206a1b5490ccef98aa88d24496892926b9e66c09 (patch)
tree3fb73965f31802369124bf9da300465c0b1a829d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2d814e8ba88ee64e6969a478a640e0490606e370 (diff)
parent018ddb2fc9bc25119baa582cb646a45a0db28cb6 (diff)
[automerger skipped] Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" am: 442a1ca027 am: 6f87ad9abd am: 018ddb2fc9 -s ours
am skip reason: Change-Id Ibb68cd4e6a6ba49c56b313380ddf16734813459b with SHA-1 8f823800d7 is in history Change-Id: I796ba1d2e4a7fe6264a319e61dc3195935c71a3c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions