tree 1779ec8aeee36361470aaa26f5ac3f9e41c0063b
parent c9322bf319e6376e3ef27c87a75e189bec3dedd6
parent 708d36e7ddae86525df3856fb8a3528d20ccd77b
author Adithya Chakilam <achakila@codeaurora.org> 1634846891 -0500
committer Adithya Chakilam <achakila@codeaurora.org> 1634847280 -0500

Merge branch 'stable-2.14' into stable-2.15

Fix conflicting methods in Schema_146 class.

* stable-2.14:
  Parallelize Schema 108
  Parallelize Schema 130 and 131

Change-Id: If1a1006d216e5346e9dbe7ac491e0ef65bea52ca