diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2020-04-08 02:11:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-08 02:11:10 +0000 |
| commit | af10f4e4a61c794ad711c9d5c2a5845ba081d1df (patch) | |
| tree | c0bef3f302f632c036734a617a454e61806bead7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e470eaf6b64a8dfe4bc2064971a3b72a3dd884ad (diff) | |
| parent | 53d83d01e5023184f4eb16b0813f4e6415b066aa (diff) | |
[automerger skipped] Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774 am: f4804c9e92 -s ours am: 94664fd08f -s ours am: 8dbfbf7400 -s ours am: 53d83d01e5 -s ours
am skip reason: Change-Id I2d38dd9a0a860ee451fe51372a62c2910b88c88f with SHA-1 ba874c6827 is in history
Change-Id: Idb76250ed59f50f44665a4c8154e87ff2bff95d4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions