Chris Galvan d7574777a8 Resolved merge conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-07-02 12:42:44 -05:00

..

Android

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Common

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

iOS

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Linux

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Mac

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

Windows

Resolved merge conflicts

2021-07-02 12:42:44 -05:00