| commit | 0f5bcea6f579b195a5ae3f8a7e6463353eac9669 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 13:19:56 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 28 13:19:56 2010 -0800 |
| tree | 96a2309fb0567d04db4efa8e7020b0377cb28da1 | |
| parent | 7843ced36a22bd5721ac0f6197270ff5fac613a0 [diff] | |
| parent | 43a4014c04248d1d398d5a36962467c56a2e1808 [diff] |
Merge "resolved conflicts for merge of 33ca1f32 to master"