| commit | b30cc6c3e87e56fc939051ff8d41442a988ff20c | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 09 09:54:05 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Apr 09 09:54:05 2015 -0700 |
| tree | ef87faf6747a5fe2e0364e91964b8c6d72c57d48 | |
| parent | d278a3f092f2526a28bc222b397f4dadf669b5b9 [diff] | |
| parent | b9a9d46c776cbdc97d28b8ad61b215a494e19061 [diff] |
resolved conflicts for merge of b9a9d46c to master Change-Id: Ibec45f0f8f9618dd7bd1b34561dccbdd9599cdeb