| commit | e0ad63bf1e038dd84ec2502243236f86104f990d | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Fri Oct 01 13:57:04 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Fri Oct 01 13:57:04 2010 -0700 |
| tree | f05b9ed0e839b84ae5f35025e1a50da56b68b2bc | |
| parent | 866717406710595a487cdca33f698876dcd4e8af [diff] | |
| parent | 6718b365bcce5bd9e67867bd165d771c2226582d [diff] |
resolved conflicts for merge of 6718b365 to master Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6