| commit | 143c93d49f7f9691ad37b8b036731b76f2171241 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Wed Aug 26 11:51:36 2015 -0700 |
| committer | Selim Cinek <cinek@google.com> | Wed Aug 26 11:51:36 2015 -0700 |
| tree | 04c0498e38bb10aa8a3700179997f69a24a5c596 | |
| parent | 3b3b22140ed4ef4f80c187ba5e6fd47f8b2d950a [diff] | |
| parent | f1935575309f2b4abb00111ebcc9571a90160058 [diff] |
resolved conflicts for merge of f1935575 to master Change-Id: Ic18619bd5a81ae5172eef41bda0f8e473b6bda3f