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)
commitc5cc798e7233b9d089b576e2e110d02048b4c1c8
tree02c983b7e16aead111e836b2b7d2c4dcb3bb7326
parenta153b68f2260a8ed7fbb236fa659b13264ac5ac0
parent3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c
am 3f93c8f8: am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"

* commit '3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c':
  libvideoeditor: fix M4OSA_Clock header guard