| commit | 998c4e88f962336472c5e1c3afbf0ed8d6d3a971 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 18 19:30:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 19:30:45 2013 -0700 |
| tree | ecfcc2f84c5fb97754559ab6e980474be15a77e4 | |
| parent | 6c63fe0fdb33e5e7eb8c89f2420262b072cdd83f [diff] | |
| parent | 0219856e5e45c0bdd20f2199297ec92f11f0875f [diff] |
am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard" * commit '0219856e5e45c0bdd20f2199297ec92f11f0875f': libvideoeditor: fix M4OSA_Clock header guard