commit | daac8c44276f607522dd0b4842e662094aa6e9a2 | [log] [tgz] |
---|---|---|
author | buzbee <buzbee@google.com> | Fri Oct 15 18:18:14 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 18:18:14 2010 -0700 |
tree | f3cf6f470b306b4495190a80eb21889a9050d7cf | |
parent | 1988249e35cd15677bf72f66e50979b5ebd39a28 [diff] | |
parent | fd9c61b2e56a4bb73ffd03d13504461e51a3611b [diff] |
am fd9c61b2: am ef1ed3c5: (-s ours) x86 mterp: fix cherry-pick/merge, issue 3095771 Merge commit 'fd9c61b2e56a4bb73ffd03d13504461e51a3611b' into dalvik-dev * commit 'fd9c61b2e56a4bb73ffd03d13504461e51a3611b': x86 mterp: fix cherry-pick/merge, issue 3095771