| commit | 1ad05dcbf506d489a99ecd9f308874d2a453db29 | [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 | fa8aeb3aee0a5d2da4385414019f02f3ef4fac06 | |
| parent | 254cb446faa7cb13699d8150eb4cc4f44cb61a2d [diff] | |
| parent | e096ddee54e022859bedc9f13b0c2d690dc5110e [diff] |
Merge "resolved conflicts for merge of 33ca1f32 to master"