tree 9fa3af09a4e719580242af5777c85e1bf022b14c
parent cda7578b46fff7720a234397d267f0a4876a41f4
parent 4b137047210a1e64df1ebc0807d4eeeac7052c1e
author Guang Zhu <guangzhu@google.com> 1277149904 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277149904 -0700

am 4b137047: restore emma changes overwrittern by I9174f843

Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp

* commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e':
  restore emma changes overwrittern by I9174f843