| commit | f5f24006f7bd997c6bca00804ec0f35bddd7ccc2 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Apr 15 22:38:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 22:38:32 2014 +0000 |
| tree | 0b7338350bbe3e69c24a9d37b81166ad958d6de9 | |
| parent | e80631aa1992ca50af679cd6a018c0ffda7f9b17 [diff] | |
| parent | cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed [diff] |
am cd4eb72e: Merge "media: -Werror re-enabled" * commit 'cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed': media: -Werror re-enabled