| commit | e26a37d2591736aa3062f8deacc61525ea0c7fb3 | [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 | 1d726b7b3320d5ba9d210eba530bb7b069e22e58 | |
| parent | af1b8029d75b599b965a15f2feba62b1bef64696 [diff] | |
| parent | a53040a705ff5c8fdd47f356a6f4fcac152f3a7f [diff] |
Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread