| commit | f271c6d266f37d600b65ada8e4e4a32d5044a49a | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Dec 22 12:00:24 2016 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Dec 22 12:00:24 2016 -0800 |
| tree | 4869bc6ef8a2d8030de2bd74b84399de86a367a8 | |
| parent | dfd504924642c23ac105c2f75a1531eaceda22bc [diff] | |
| parent | b53d98413261c22e26d5bde635ac52012b78b8cf [diff] |
resolve merge conflicts of b53d984 to master Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26