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