| commit | cef504f9142db0b92b34578e22c689ef53135210 | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Wed Jan 13 00:03:04 2016 +0000 |
| committer | Pavel Zhamaitsiak <pavelz@google.com> | Wed Jan 13 00:08:41 2016 +0000 |
| tree | 305b145b40041c1541a2f3d9e154fba173c41084 | |
| parent | 95a0c7c8e63ab0a53ba1b225effe593c71b9ddb7 [diff] |
resolve merge conflicts of 68514d5325 to master. Change-Id: Ifbd3766e8a799a72e49adcdc6c5d509f2b8b53a6