| commit | 35a4f21bd6c6aa82b88e53798131f0a0ff6976c4 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Tue Nov 02 14:02:59 2010 -0700 |
| committer | Gloria Wang <gwang@google.com> | Tue Nov 02 14:02:59 2010 -0700 |
| tree | 808ee71e7a3141d4a535c7a0a3ad1ba5ce93556f | |
| parent | a090d64ac198b878a3ea01204298d5ed5eb8fbb8 [diff] | |
| parent | c1c45a4dc950865a7f5f76d8aab56be0cc8e0e91 [diff] |
resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455