| commit | 9e4c43b0ed1d7cd2522c222008ad84fcf58152c9 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Aug 17 12:27:24 2011 -0700 |
| committer | Jeff Davidson <jpd@google.com> | Wed Aug 17 12:27:24 2011 -0700 |
| tree | c85ab41eeb564582b7917c9a4323c3a6eda9704d | |
| parent | 4bffd81ee27982093b6601aaa36b4278f6ce620f [diff] | |
| parent | 2cf803dec1535b778bb98ffc91cfa46e08b6df41 [diff] |
resolved conflicts for merge of 2cf803de to master Change-Id: I3cda5ecf88894d314204a585fb03a1d441fc97f4