| commit | 655ce403cd28f849b24162399b3d060797d2324f | [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 | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | 91fb608db1f4e7c01b9286aae774e6217c1ed148 [diff] | |
| parent | e9a1e57d0465fad57a90d25d2c352dfc806f7f76 [diff] |
resolved conflicts for merge of b3ffd4ad to master Change-Id: I80b227b678ef168a45494acf879debed5861de39