tree 3791d970dc0420e6a6d89177af1fc25bf103c321
parent ab70649e2b0ea3d917242814417ec5711f4cb811
parent 6e2884495babd1163c0eed1b9233c81c2dae1fb8
author Nick Kralevich <nnk@google.com> 1382149689 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1382149689 +0000

Merge "libvideoeditor: fix M4OSA_Clock header guard"