| commit | cf393faaa871333496a63c13196fdbc0f2bd9118 | [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 | e28d98df57c560119ad98e90c1b3cf939d168583 | |
| parent | fcea62a64cba3422ae7d0c1eeee529fd49485984 [diff] | |
| parent | 35a4f21bd6c6aa82b88e53798131f0a0ff6976c4 [diff] |
Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp