| commit | 51c4608bd5dcb4662b5993d3609f895e4722ec55 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Tue May 27 18:36:44 2014 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Tue May 27 18:36:44 2014 -0700 |
| tree | b3187757f4aaad642399e3c824848b822290dd5b | |
| parent | 510ccf0bf802726ea72fd963974dcccc48940e41 [diff] | |
| parent | 5eb44d92db2983cd669a6c30ff147ec50f0c8462 [diff] |
resolved conflicts for merge of 5eb44d92 to master Change-Id: Ia6a2cc5664ba84b048c9ecf142173d8e141b83e9