diff options
author | Amit Mahajan <amitmahajan@google.com> | 2019-11-01 16:01:02 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-01 16:01:02 -0700 |
commit | 62bcfb93f14ce355c2a5c042e44d4306c6c61ae0 (patch) | |
tree | 20f089ac6861d51639395bdd9e444a411d2a9262 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2c7af2ae093623229b338cc8af49aa2bb7cf698f (diff) | |
parent | 9b3c4c1484354d5244597e51340a078db2645df5 (diff) |
[automerger skipped] Merge "Move getMmsConfig from SmsManager to MmsService." am: 023d2d650b am: 86bb28e1b3
am: 9b3c4c1484 -s ours
am skip reason: change_id If0a4b319f23d1a01e98f64ed1ae6eb6b90ccb02a with SHA1 214f7ec7fa is in history
Change-Id: I3e09131d6b5d350626e00cc6d783c97e402c414b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions