| commit | 76275ac1c53585a374b5e5f1834631fca9392dd8 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Oct 12 13:52:44 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Tue Oct 12 13:52:44 2010 -0700 |
| tree | bfaeb599f6a3664a628a4015bdaf79c3873ca34f | |
| parent | adb4229c23faef81705b6b2fe1dfb8a6474c254c [diff] | |
| parent | 700889f504ef134ab307d95b6bfbbb426ea730e3 [diff] |
resolved conflicts for merge of 700889f5 to master Change-Id: I85320de6483e6820fe27b4012bfc323ccafa0e04