| commit | f21b4cde1865747ed054111944e6b30e38109293 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Mon Oct 11 10:46:01 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Mon Oct 11 10:46:01 2010 -0700 |
| tree | bab5ec90cf3b26ed89a28ff4ff2a327bc0260fff | |
| parent | 2b4b3bd4b45255a21ff296271c02167a800a3958 [diff] | |
| parent | b3ffd4adccc430f59a9348dd218d23545e4f6c65 [diff] |
resolved conflicts for merge of b3ffd4ad to master Change-Id: I80b227b678ef168a45494acf879debed5861de39