| commit | c5cc798e7233b9d089b576e2e110d02048b4c1c8 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 18 19:35:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 19:35:38 2013 -0700 |
| tree | 02c983b7e16aead111e836b2b7d2c4dcb3bb7326 | |
| parent | a153b68f2260a8ed7fbb236fa659b13264ac5ac0 [diff] | |
| parent | 3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c [diff] |
am 3f93c8f8: am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard" * commit '3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c': libvideoeditor: fix M4OSA_Clock header guard