| commit | 589500fe2ee2c6e0fbcf9a5ef95bb297720932d7 | [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 | c37f939fb51cddaf2f323fd4074ff73068bc7b2e [diff] | |
| parent | b940309ec74f826b0606b4bc1fc6635951dab8ad [diff] |
resolve merge conflicts of b940309ec7 to master. Change-Id: Icd6daa7385b8cd8c19f52dbc6805142e81b93dc9