| commit | 605775c4edc6888e377d3f423c3b358b7b26565f | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Tue Aug 20 18:18:14 2013 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Tue Aug 20 18:18:14 2013 -0700 |
| tree | b0f87dbdab27b74216aaf6b15040e7251982fb8a | |
| parent | 6fd5e5503b6a7e557503b837c0d9a3967bcb1abf [diff] | |
| parent | ba35cf7a888931d2f53a7ffd767918579af5d334 [diff] |
resolved conflicts for merge of ba35cf7a to master Change-Id: Id9e6fa12056fc6cef7b77c70c73591dfc82e70a9