diff options
| author | Elliott Hughes <enh@google.com> | 2011-06-23 11:57:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-06-23 12:06:26 -0700 |
| commit | 61e50bdecb9161ab87fbeb1d20da1a86ff7e8f59 (patch) | |
| tree | 5045c1dcc5964c206d897137afb247da92742f06 /vm/native/java_lang_VMThread.cpp | |
| parent | 1a87dec67db6c5a37442c1338d9b8c626c95a545 (diff) | |
| parent | cc8c750a30dee0b7bac1281533581e86d07b9c8e (diff) | |
resolved conflicts for merge of cc8c750a to master
(The transition to C++ requires an additional cast.)
Change-Id: I736f6533511d5ab2d1f05903b06d8f333adba492
Diffstat (limited to 'vm/native/java_lang_VMThread.cpp')
0 files changed, 0 insertions, 0 deletions