| commit | 585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Fri Aug 27 09:24:29 2010 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Fri Aug 27 11:05:11 2010 -0700 |
| tree | 257ca7032592dbd69e2d213bc8cca1ace651c8ac | |
| parent | e73d10c6fb9013ee8e26f337384d4924f6db8a21 [diff] |
resolved conflicts for merge of 4ea54f44 to master Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56