| commit | 305ebe207a174c9f46146ad73572a601b8a28787 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Apr 01 18:21:35 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Wed Apr 01 18:23:27 2015 -0700 |
| tree | 7ceb46d0512a5f49c4b78d876d339913d3a99eb4 | |
| parent | 25e9d87b11ef7cf81b5584358776a95f871fee66 [diff] | |
| parent | 261e7a37df06c9c5f22ce3f7ade96cf8c9677354 [diff] |
resolved conflicts for merge of 261e7a37 to master Change-Id: If0a3389764965fe27bf567090a6e24069b61c544