| commit | 5ce02e52b2898ca9a6ce0892e1c91b2c3704b087 | [log] [tgz] |
|---|---|---|
| author | Jason Chen <jasonchen@google.com> | Mon Oct 11 09:22:57 2010 -0700 |
| committer | Jason Chen <jasonchen@google.com> | Mon Oct 11 09:24:33 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | eba77c6ecedcb58d25fe540d499bcee2eecd1827 [diff] | |
| parent | 2bd20112a5336db2628cf09e1a824bbfc5ca7234 [diff] |
resolved conflicts for merge of '1d58e52a' into master Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f