tree 24c537ea7b57bbfe7cfb65be2c70ac6c70d3c278
parent ce9c317b806aabd7d460a52e1c46f04f7e2c9bb6
parent 41005ddb5576b8630a1084fbb3979ffa602c0599
author jeffhao <jeffhao@google.com> 1337122229 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337122229 -0700

Merge "Fix x86 type conversions. test-art-host-oat passes." into ics-mr1-plus-art