commit | ee195f3365e1284705956cbda09a2924b8d8e906 | [log] [tgz] |
---|---|---|
author | Steve Howard <showard@google.com> | Thu Jul 08 19:09:53 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 08 19:09:53 2010 -0700 |
tree | 636f904c087275cc4e868897d70c77f581061e3a | |
parent | e8d9c4d3c176eea177563921e5e9cb4f8ffc022c [diff] | |
parent | 8b0ecc08166a4e83a8df5864e5264a88962101f1 [diff] |
am 8b0ecc08: am de6a0857: Fix broken interaction of JarJar and Emma. Merge commit '8b0ecc08166a4e83a8df5864e5264a88962101f1' * commit '8b0ecc08166a4e83a8df5864e5264a88962101f1': Fix broken interaction of JarJar and Emma.