| commit | fbf1472d613572d991bc9d68ded4c9e937f13586 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Apr 13 10:54:53 2015 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Mon Apr 13 10:54:53 2015 -0700 |
| tree | c401bc8005739b23f27f108274ba03b8b714069b | |
| parent | 62d1d9efe72752fd00c791f596163856708beac2 [diff] | |
| parent | a978a3d6e9586af8cc7191cde83dcf2742ea5269 [diff] |
resolved conflicts for merge of a978a3d6 to master Change-Id: Ifd7ca9e1dfa0d50a87f2bafef377fcaeb5d9f6d5