OSDN Git Service

am ded830f7: resolved conflicts for merge of aa63a6a6 to gingerbread-plus-aosp
authorAndy McFadden <fadden@android.com>
Tue, 24 Aug 2010 18:21:47 +0000 (11:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 18:21:47 +0000 (11:21 -0700)
Merge commit 'ded830f7d936821a4136fc8c08064b43beff9341'

* commit 'ded830f7d936821a4136fc8c08064b43beff9341':
  Added new bytecodes for the x86-atom fast interpreter build.


Trivial merge