| commit | 12815f5ac09055ba6a3cd04a14f3bc9d2e537a25 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Wed Sep 01 17:10:36 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Wed Sep 01 17:10:36 2010 -0700 |
| tree | fa5044f4cb69e9648147b9522da4bcff66c981a8 | |
| parent | 0142d49e1378a7155bcca1fb59965d9e73016dbc [diff] | |
| parent | 319226a894f5f0b94ca94e64f976a043e3873a40 [diff] |
resolved conflicts for merge of 319226a8 to master Change-Id: Ibeefaa496cc3970e35af007fb64344c2a0f1f82f