diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-08-02 12:28:22 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-02 12:28:22 -0700 |
| commit | ee8fb1e1d94e0be860e1dc2a5f15d4355a3c6639 (patch) | |
| tree | 7fb97efc69ad14058204e54659194ad8e731f9e4 /vm/compiler/codegen | |
| parent | cff569c2e9d9c323edc6d974ebe69fded6d18c0c (diff) | |
| parent | ae77d6b60ffa091d4d72597d2dd244cd6758e18f (diff) | |
| download | android_dalvik-ee8fb1e1d94e0be860e1dc2a5f15d4355a3c6639.tar.gz android_dalvik-ee8fb1e1d94e0be860e1dc2a5f15d4355a3c6639.tar.bz2 android_dalvik-ee8fb1e1d94e0be860e1dc2a5f15d4355a3c6639.zip | |
resolved conflicts for merge of ae77d6b6 to master
Change-Id: If7712cbddd6786c91648c4fc31f04e96937d4670
Diffstat (limited to 'vm/compiler/codegen')
| -rw-r--r-- | vm/compiler/codegen/x86/libenc/enc_wrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/compiler/codegen/x86/libenc/enc_wrapper.cpp b/vm/compiler/codegen/x86/libenc/enc_wrapper.cpp index 7b83788c0..71e0e0697 100644 --- a/vm/compiler/codegen/x86/libenc/enc_wrapper.cpp +++ b/vm/compiler/codegen/x86/libenc/enc_wrapper.cpp @@ -17,10 +17,10 @@ #include <stdio.h> #include <assert.h> #include <limits.h> +#include "cutils/log.h" #include "enc_base.h" #include "enc_wrapper.h" #include "dec_base.h" -#include <cutils/log.h> //#define PRINT_ENCODER_STREAM bool dump_x86_inst = false; |