| commit | 14f57541b442135f7ede59a442cd324e27602c55 | [log] [tgz] |
|---|---|---|
| author | Michal Karpinski <mkarpinski@google.com> | Wed Apr 26 11:49:00 2017 +0100 |
| committer | Michal Karpinski <mkarpinski@google.com> | Wed Apr 26 11:55:02 2017 +0100 |
| tree | d6269c9a7dbd8f37290227b920702dbf24271040 | |
| parent | 058a73e7307a5c991d0a683f16725c550b3f0c1b [diff] | |
| parent | 970525ef3225546aadf6f0c81b7ecfc44ea1146b [diff] |
resolve merge conflicts of 970525ef3225 to master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia4860b81fbd1f45e6594197b1de75ff3531c4826