OSDN Git Service

am de6a0857: Fix broken interaction of JarJar and Emma.
authorSteve Howard <showard@google.com>
Thu, 8 Jul 2010 18:12:20 +0000 (11:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Jul 2010 18:12:20 +0000 (11:12 -0700)
Merge commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787' into gingerbread-plus-aosp

* commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787':
  Fix broken interaction of JarJar and Emma.


Trivial merge