| commit | 6b1bf60752166ca5b528b8c9786f3c381f0ade88 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Sep 01 15:53:26 2010 -0700 |
| committer | Andreas Huber <andih@google.com> | Wed Sep 01 15:53:26 2010 -0700 |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | 2a5342ad55b1ef9d9682b24bd8f0f46b949e0f73 [diff] | |
| parent | 71e8b8313800f6abcfa42c5d023a7783361280a3 [diff] |
resolved conflicts for merge of 71c908c4 to master Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047