| commit | 3c98fa4ff6e05cf69a150d4f5378ce7a9c922894 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Sep 23 23:22:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 23:22:09 2015 +0000 |
| tree | ec76457c6c57aae8536cdf1a9a3c45c4efcf814e | |
| parent | 0a712e0c7f292821ac7a997a75dbe2388378bed4 [diff] | |
| parent | 45fc581c209b93362805eb89a5f2b7935c21f167 [diff] |
am 45fc581c: am 9664e182: resolved conflicts for a17b1999 to stage-aosp-master * commit '45fc581c209b93362805eb89a5f2b7935c21f167': Revert "Enable integer overflow detection in libmedia"