| commit | df36dc2c275205a89a17c604f797d5371128ba7c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 12 11:55:12 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 12 11:55:12 2010 -0800 |
| tree | 3870e77f24d875c74f6db4d5de77cf63be37e04c | |
| parent | 17c3c4a6297e273443146a35fb7ca8bc2f9a6c00 [diff] | |
| parent | 40858b24e7183dbb3afe9928d2939833344c7e01 [diff] |
Merge "resolved conflicts for merge of d26707da to master"