| commit | 3876bebeea440474dfecf34e7a759d265bf67e0e | [log] [tgz] |
|---|---|---|
| author | Aga Madurska <amad@google.com> | Wed Sep 28 17:42:39 2016 +0100 |
| committer | Aga Madurska <amad@google.com> | Wed Sep 28 17:47:27 2016 +0100 |
| tree | 23ca0dbba71788b5cfce14ac966bb71c38542809 | |
| parent | 3b8dd61062c67f0e1dd55d6e6b8c3f99d0075314 [diff] | |
| parent | 571fe863ac043df0353cceabad066b3f6a395786 [diff] |
Resolve merge conflicts of 571fe86 to master Test: Merge conflict resolution. CL adds tests. Change-Id: Ib4a18c02761273cde62de57b1a959da2d37d803d