| commit | 6023b5810e1400a06337d9a99d2e0edc39f21393 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Aug 24 15:15:19 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 24 15:15:19 2010 -0700 |
| tree | c89a740caefb96a9b769f731193e012968a3f934 | |
| parent | ed8188711a794867b47d21bbed3e26827f6c27e3 [diff] | |
| parent | 925f2f909649dd0cbf93674201430879c2e03f99 [diff] |
Merge "resolved conflicts for merge of 9765b2a0 to master"