| commit | 8b69297759bb2f4584e3c120ed8de029693605d8 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Fri May 02 15:11:38 2014 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Fri May 02 15:11:38 2014 -0700 |
| tree | bb388f0efc17d462640099b1ed6843fb50f25b1c | |
| parent | cdc2c334db715eecf8a36f8f86828f553ec90846 [diff] | |
| parent | 6ac53bee47d3a62371e41ce4c9a9e2332069132e [diff] |
resolved conflicts for merge of 6ac53bee to master Change-Id: I7a160d224f20e825f060561725b11f5cc7b2c685