| commit | 24b1c64c5b6c91f72c3f2fa0f30d881c65efb124 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Jan 22 11:05:03 2016 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Fri Jan 22 11:05:03 2016 -0800 |
| tree | 830171f21151e163d6155d077c95641450b39317 | |
| parent | f2ca92d9c47b887af6a0b7408af2e0f1b636deba [diff] | |
| parent | bb3d77ba95e4c2f8747524f90c4be5032e1179ee [diff] |
resolve merge conflicts of bb3d77ba95 to master. Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a