| commit | 575362127d558cebdd8a092e65141e2b369f27fe | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Dec 22 19:36:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 22 19:36:46 2014 +0000 |
| tree | 466c4cccb560840b6dffd122d46da976b55b4d9c | |
| parent | be9badda80915565f718341f43bc0ec4cae80ca1 [diff] | |
| parent | 460bb2c6dad7ff9637f148177689598cc6f66486 [diff] |
am 460bb2c6: Merge "ART: Do not compile swap file functionality on Mac" * commit '460bb2c6dad7ff9637f148177689598cc6f66486': ART: Do not compile swap file functionality on Mac