| commit | 10b3f4b8fc48ef12bced83716ef9fc08ec67ee1c | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Mon Jun 21 12:51:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 21 12:51:44 2010 -0700 |
| tree | 9fa3af09a4e719580242af5777c85e1bf022b14c | |
| parent | cda7578b46fff7720a234397d267f0a4876a41f4 [diff] | |
| parent | 4b137047210a1e64df1ebc0807d4eeeac7052c1e [diff] |
am 4b137047: restore emma changes overwrittern by I9174f843 Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp * commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e': restore emma changes overwrittern by I9174f843