| commit | 40485f5aac5bc02fb3b24ad03ac71f724e4c340a | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 24 14:11:52 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Fri Apr 24 14:21:41 2015 -0700 |
| tree | 9f79fc0e91e9f1ac1d10487882fc56916d373b11 | |
| parent | 8f74a5d811e3cfc168076d05a5d74c34fd04cd27 [diff] | |
| parent | f9c14b7d169d502b63d1d5b329475a97b02f3848 [diff] |
resolved conflicts for merge of f9c14b7d to master Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0