tree 1badbdd01fc9b5ac786ce8b35b1eae1ab5821163
parent fddf6f6b4af42c32dd2e92234bab0741118d092e
parent e44f47f7360f02e9d67351ebf993ad487abd971a
author Ian Rogers <irogers@google.com> 1331859741 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331859741 -0700

Merge "Fix offset math for upcalls on x86" into ics-mr1-plus-art