commit e37543ed52379bcf08f57ebb3510846294a7102c
author Logan Chien <loganchien@google.com> Tue Aug 07 11:33:08 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 07 11:33:08 2012 -0700
tree d3e28d72db66d5d4313685e2159d5b4fe71cdcb0
parent 0e3ac14885bb646b187cda5ff8dab08cf6c99b43
parent e6a5b765c458eb0306468fafe29bee20cbff3bbe

am e6a5b765: Rename int_to_byte to int_to_short.

* commit 'e6a5b765c458eb0306468fafe29bee20cbff3bbe':
  Rename int_to_byte to int_to_short.

src/greenland/intrinsic_func_list.def

diff --git a/src/greenland/intrinsic_func_list.def b/src/greenland/intrinsic_func_list.def
index 0ebebb2..ee508d3 100644
--- a/src/greenland/intrinsic_func_list.def
+++ b/src/greenland/intrinsic_func_list.def
@@ -1316,7 +1316,7 @@
 
 // int int_to_short(int)
 _EVAL_DEF_INTRINSICS_FUNC(IntToShort,
-                          dex_lang_int_to_byte,
+                          dex_lang_int_to_short,
                           kAttrReadOnly | kAttrNoThrow,
                           kInt32Ty,
                           _EXPAND_ARG1(kInt32Ty))