tree ec76457c6c57aae8536cdf1a9a3c45c4efcf814e
parent 0a712e0c7f292821ac7a997a75dbe2388378bed4
parent 45fc581c209b93362805eb89a5f2b7935c21f167
author Chad Brubaker <cbrubaker@google.com> 1443050529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443050529 +0000

am 45fc581c: am 9664e182: resolved conflicts for a17b1999 to stage-aosp-master

* commit '45fc581c209b93362805eb89a5f2b7935c21f167':
  Revert "Enable integer overflow detection in libmedia"