OSDN Git Service

am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
authorNick Kralevich <nnk@google.com>
Sat, 19 Oct 2013 02:32:44 +0000 (19:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Oct 2013 02:32:44 +0000 (19:32 -0700)
commit3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c
tree63d52345740434a0e4765ad408f2d5279eb7b4f2
parent77177fa20773d02b4f9c4147ecb98107f019fa7d
parent998c4e88f962336472c5e1c3afbf0ed8d6d3a971
am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"

* commit '998c4e88f962336472c5e1c3afbf0ed8d6d3a971':
  libvideoeditor: fix M4OSA_Clock header guard