| commit | fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a | [log] [tgz] |
|---|---|---|
| author | Dan Egnor <egnor@google.com> | Tue Jul 20 13:23:09 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 20 13:23:09 2010 -0700 |
| tree | be1f93bafc2f7e2ebe4031c11a46f1893112d121 | |
| parent | 22a2d7186d015efcd648dff99500f8467463be82 [diff] | |
| parent | 341ff13689dfe822b598e626272ac2e80041b482 [diff] |
Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread