| commit | 7f5b87692b49a3ae674eda76d5fd77ab49b97409 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 02 14:58:27 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Apr 02 14:58:27 2015 -0700 |
| tree | fa325c76dfd271749bd784f96e5b4db349907d1d | |
| parent | f4f0671618c583f70ea64097062bd2c0b14ee704 [diff] | |
| parent | e7e705d49401ec86147a889f7dee2b342147d19b [diff] |
resolved conflicts for merge of e7e705d4 to master Change-Id: If3e8c985f4f122f9fb36aab206787aac1407a74e