| commit | aedc94bf11eb8c9132905a3c19663b5895f48550 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Dec 22 11:20:26 2016 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Dec 22 11:20:26 2016 -0800 |
| tree | a4114beabe11070d82932f314d86d269ecea1735 | |
| parent | 41a91fa3a2cabbb11202b520c103f391ba43e3ea [diff] | |
| parent | a9888fc0c42d643e29e80bd0f2394d87f3339f44 [diff] |
resolve merge conflicts of a9888fc to master Change-Id: I6ad00bf5bc1b18406b7fc8969c35bf7970fd1967