OSDN Git Service

am 3f93c8f8: am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header...
authorNick Kralevich <nnk@google.com>
Sat, 19 Oct 2013 02:35:38 +0000 (19:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Oct 2013 02:35:38 +0000 (19:35 -0700)
* commit '3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c':
  libvideoeditor: fix M4OSA_Clock header guard


Trivial merge