tree 8c90f1432fbbccd92052567a6322a903053203f2
parent 06d02f32a811fefb40f164a3e4fdfd6b1817aca2
author Asim Shankar <ashankar@google.com> 1446073245 -0700
committer Asim Shankar <ashankar@google.com> 1446073245 -0700

Counterpart of https://vanadium-review.googlesource.com/17148

MultiPart: 4/5
Change-Id: Ib68b42fff87a49f58d34b31961d24f570d684e60