tree 90485f0b968412906326e1248a5da0d6e025a003
parent 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d
parent f5f24006f7bd997c6bca00804ec0f35bddd7ccc2
author Mark Salyzyn <salyzyn@google.com> 1397605040 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397605040 +0000

am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"

* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
  media: -Werror re-enabled