| commit | 45f904a529a65b861442f92d7f906002cd0f528e | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Wed Jun 11 11:42:53 2014 +0200 |
| committer | Selim Cinek <cinek@google.com> | Wed Jun 11 11:45:24 2014 +0200 |
| tree | f99bd06bb30893e4163ea4bb6a64be1a1113a422 | |
| parent | 7207b792d961deb78ccbe9b86e67c185992bc29a [diff] | |
| parent | 295609a9a58a367e7b54f3c777c218954606154b [diff] |
resolved conflicts for merge of b38fd3d4 to master Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e