| commit | efe8928f9137e1ec9be0e61e3206a9ebcf06e1ca | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Aug 24 15:11:30 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Tue Aug 24 15:14:12 2010 -0700 |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
| parent | 1095f2bcefb35037f11e63c11c73357b43fbf80a [diff] | |
| parent | aef5507a7e957c3eb22910af5aa867f22862530f [diff] |
resolved conflicts for merge of 9765b2a0 to master Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53