| commit | 2f8a1551b3a45061d74b15ddd0d3530ca43f4b2b | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Aug 05 16:02:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 05 16:02:14 2014 +0000 |
| tree | b539de35965841d45a6990385a6290649ef956bc | |
| parent | 6f0ddc443f65cff3bd7de3f2aa0f34326f3272b7 [diff] | |
| parent | f6735280cdb627985ec10a10391211aba7a67a57 [diff] |
am f6735280: resolved conflicts for merge of ac304133 to lmp-dev-plus-aosp * commit 'f6735280cdb627985ec10a10391211aba7a67a57': ART: Fix memory unmapped twice issue in ElfFile::Load(bool)