| commit | 9bc44ea84f1ce1bbe2c6d2004f05524784ca2636 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Tue Nov 02 14:05:13 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 02 14:05:13 2010 -0700 |
| tree | 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f | |
| parent | dc6805745f78fae0b053f67886d002574ddcebe3 [diff] | |
| parent | 49bcf3e8b6b72b646a89d6cdec3aea1a80bb1238 [diff] |
Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp