| commit | 0255261244c020a651cf08edee541d4118e7f84d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Apr 13 11:05:14 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Wed Apr 13 11:05:14 2011 -0700 |
| tree | b5be3c64020a06f61d2d592c49e32705c24c234a | |
| parent | 41a36383afe9ab10aefa488acb1677f5675b2358 [diff] | |
| parent | 2c801c4eb7be91863015c20c6c9f5857c5444f94 [diff] |
Merge "resolve a bad merge"