| commit | c3d14f58d80cc5ed8b60ee1782d38643c08734e7 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Fri Nov 20 15:03:48 2015 -0800 |
| committer | Svetoslav <svetoslavganov@google.com> | Fri Nov 20 15:03:48 2015 -0800 |
| tree | 24dd2d2db0d8196ceacc681d9a896011cb8e84f9 | |
| parent | ef861375eebd9ac6cce7c0bb163380ab1c951063 [diff] | |
| parent | c10abb25f3864e56b2a24ef3661511cd78921225 [diff] |
resolve merge conflicts of c10abb25f3 to cw-e-dev. Change-Id: I965fb579e2730fa1cdb182bc18e134f262929328