| commit | 8a1b71120e9e628f0b6415dcf69bc94bc6400f39 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Wed Dec 09 17:58:00 2015 -0800 |
| committer | Daniel Rosenberg <drosen@google.com> | Wed Dec 09 17:58:00 2015 -0800 |
| tree | 7400b02403be3f00dfad8be57067dedc341d02a7 | |
| parent | 9c94e70a14e5fdd968d8663fdbfce6f23a882acf [diff] | |
| parent | 679dae7c69eff0021ca64e3c32190bd05d0bdaf4 [diff] |
resolve merge conflicts of b940309ec7 to master. Change-Id: Icd6daa7385b8cd8c19f52dbc6805142e81b93dc9