diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-10 08:46:00 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-10 08:46:28 -0700 |
| commit | 2c3caadb48b066a0355cd3d2dcd5d5e9b48fc19c (patch) | |
| tree | fc53640b73fb2f648e018a15bed8585818f3784f /src/jni_internal.cc | |
| parent | 75fe90cdb6e358a09047468b750648c8a3bfac9f (diff) | |
| parent | 0b4e3ef67508a0b8c121b6b26ab5ea0a1d8e7141 (diff) | |
| download | android_art-2c3caadb48b066a0355cd3d2dcd5d5e9b48fc19c.tar.gz android_art-2c3caadb48b066a0355cd3d2dcd5d5e9b48fc19c.tar.bz2 android_art-2c3caadb48b066a0355cd3d2dcd5d5e9b48fc19c.zip | |
Merge remote-tracking branch 'goog/dalvik-dev' into merge-art-to-master
Change-Id: Id6bec909d7137192be0acc7bd8f736d1d8027745
Diffstat (limited to 'src/jni_internal.cc')
| -rw-r--r-- | src/jni_internal.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jni_internal.cc b/src/jni_internal.cc index 2673074302..e457edcd8f 100644 --- a/src/jni_internal.cc +++ b/src/jni_internal.cc @@ -28,7 +28,7 @@ #include "base/stringpiece.h" #include "class_linker.h" #include "dex_file-inl.h" -#include "gc/card_table-inl.h" +#include "gc/accounting/card_table-inl.h" #include "invoke_arg_array_builder.h" #include "jni.h" #include "mirror/class-inl.h" |