| commit | 4103016bfe2452900af7c3c6e250879e502e6232 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Oct 05 12:26:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 05 12:26:22 2010 -0700 |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 | |
| parent | 536c9e26afd4c63a104d88d6149d629721f046a7 [diff] | |
| parent | bcaeac176fed73d3dd73f0e43b04e62cf3420917 [diff] |
Merge "resolved conflicts for merge of 8390651c to master"