| commit | 7f7ce40f90cf00dc046fb9520d77d29e96b474d6 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Fri Aug 27 16:11:27 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Fri Aug 27 16:11:27 2010 -0700 |
| tree | a1417c53bcb4e35f1aa261686aa7b789ca8314c5 | |
| parent | 6ff0dc0ad9a93a96262da3c0e40483137568de43 [diff] | |
| parent | 28130baefb4fa6d1e0ff9c92337295ba74461cf7 [diff] |
resolved conflicts for merge of 28130bae to master Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a