commit | ec1fa54fa4327cc4eefe99efa3fd198bc00a29c0 | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Mon Dec 22 21:14:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 22 21:14:23 2014 +0000 |
tree | 51129c490a15f55fe22106eb0a41999dbcf70d63 | |
parent | 575362127d558cebdd8a092e65141e2b369f27fe [diff] | |
parent | 06814c9a6e40e8a1e211cd40ebf6431ce4a9721d [diff] |
am 06814c9a: Merge "ART: Mac build fix" * commit '06814c9a6e40e8a1e211cd40ebf6431ce4a9721d': ART: Mac build fix