| commit | 08ed700fa8645c45776a63882ea245ace017e6d8 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Oct 04 14:17:51 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 04 14:17:51 2010 -0700 |
| tree | 7b4b9d3ec3497fdee7cdbb2cb466201708521588 | |
| parent | a1cf4a78d164664ba52e9f993cf36fd0b46609bc [diff] | |
| parent | 152c7c4091bf7c545b6a5a037cc02f55c4f126e9 [diff] |
Merge "resolved conflicts for merge of 115b9dc3 to master"