| commit | 505735b1cccea9bd6a30dd3b3d5cde0e5022f414 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Fri Aug 27 16:12:57 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 27 16:12:57 2010 -0700 |
| tree | ce7d8685d89f4138dc26a9cceca0f3b06b5af461 | |
| parent | 1ec505668bf99d9f12c412e353916b1c44fd4ff1 [diff] | |
| parent | 7f7ce40f90cf00dc046fb9520d77d29e96b474d6 [diff] |
Merge "resolved conflicts for merge of 28130bae to master"