diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2020-04-08 01:23:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-08 01:23:23 +0000 |
| commit | 94664fd08fcdc7a108ff20f44229e7ccc669206d (patch) | |
| tree | c8fdc825d676a08b7fc940e71f106765517793b2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a6ba2079fa5f43531eac2e84caaec2bf8ec9f530 (diff) | |
| parent | f4804c9e9235a89c759490abfafc807bfa3bc99f (diff) | |
[automerger skipped] Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774 am: f4804c9e92 -s ours
am skip reason: Change-Id I2d38dd9a0a860ee451fe51372a62c2910b88c88f with SHA-1 ba874c6827 is in history
Change-Id: I64dd1a1d53b70bfeb10f8577acd77499aec722bf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions