| commit | 1e3b364b735c5540cb6e9017806590d648346a93 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Oct 11 12:23:55 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Mon Oct 11 12:23:55 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | 52d37ef574a70967f372ab144b034ac58cfa7d0d [diff] | |
| parent | badc41e13afaf02efe1839453875115524a99d29 [diff] |
resolved conflicts for merge of 2da9338c to master Change-Id: I0a5d667b578e23c064ebe7bacc898125fbf40cc2