| commit | bbb5bec7018f9fa6463df4334e1c74ba35699a57 | [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 | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
| parent | 1095f2bcefb35037f11e63c11c73357b43fbf80a [diff] | |
| parent | efe8928f9137e1ec9be0e61e3206a9ebcf06e1ca [diff] |
Merge "resolved conflicts for merge of 9765b2a0 to master"