| commit | 3412280cbc287d49dca889ff22e7c65749cd58ef | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Oct 01 20:21:56 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Thu Oct 01 20:21:56 2015 +0100 |
| tree | 9abedec649511eb3b398db2b5ab75c1c2e722e85 | |
| parent | 45dd164bff09960f684fc70ab2a371a7f507701e [diff] | |
| parent | 075f690dae125375a67eddce577fa6d8f6028711 [diff] |
resolved conflicts for 075f690d to master Change-Id: I35b870a1e43b9a4b9f09ecabee68c54f993b036f