| commit | 57cf1811706d65be17babca189808539d6e2bf9e | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri May 02 22:58:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 22:58:20 2014 +0000 |
| tree | 7a17092e9f64f42913f9f97e2d233bd450bf4c85 | |
| parent | 2f2979d37f464fba1c7d07f22170f8ec92763282 [diff] | |
| parent | 8cede9508666c53b116857563e433460daffe43f [diff] |
am 8cede950: Merge "ART: Fix assembler_test to use ScratchFile" * commit '8cede9508666c53b116857563e433460daffe43f': ART: Fix assembler_test to use ScratchFile