tree d25825bc6922077f97c572c8e50639623f30a446
parent d50655ead468a05ca0cdb408dedd951c16fffd27
parent 82a9ea24e1ac16a1767bd2788c24f045e2a9c8bb
author Scott Lobdell <slobdell@google.com> 1546897477 -0800
committer Jose Galmes <jgalmes@google.com> 1547683637 -0800

Merge QP1A.190107.001

Conflicts:
clatd.h
clatd_test.cpp
ring.c

Change-Id: Ia079ef1480658949999938eb19f24c3dede5ae88