| commit | b6b193013d4641cbbf0170c98aebc5c3f6a2214b | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Oct 04 16:01:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 04 16:01:22 2010 -0700 |
| tree | eab55d5c70f026a74de0ce36362e9efe03c02a3d | |
| parent | e799720dd478c60ac027d296f329b469119d1c1c [diff] | |
| parent | 3dd101133a4cf0247ee9f2665abc360a134d0665 [diff] |
Merge "resolved conflicts for merge of 242fa52b to master"