| commit | 0b1567bccbb3dcf74bafcf3335db5c646da9227a | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Mon Jul 14 20:39:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:39:15 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | 096cd349e527565e491fdf684d9ef8280d7dfd08 [diff] | |
| parent | 7a60c5d9bd015e4e6a40dd0b0f19f9fe95f2402f [diff] |
am 7a60c5d9: am 6302c888: am b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics." * commit '7a60c5d9bd015e4e6a40dd0b0f19f9fe95f2402f':