| commit | fea48b215175fe4e98ac21e8c7426c5f59df76a4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 17 17:35:09 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 17 17:35:09 2010 -0800 |
| tree | ed68a85d29dc6c8b8f72b947b778186e6f871579 | |
| parent | 28462eb7a6cba60f933fca65975e13c510859ab3 [diff] | |
| parent | bda00faca828fd9e537972de059ba0e96e7eff56 [diff] |
Merge "resolved conflicts for merge of 1a2344b8 to master"