| commit | 714254d595e592270126f6b487cb66f44148770b | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Sep 13 14:21:44 2016 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Tue Sep 13 14:21:44 2016 -0700 |
| tree | cc889754aa6139535ff58fe2afcd76e47a0685c1 | |
| parent | 0a9ba66b88190e255a85701d5abc728ae41ad136 [diff] | |
| parent | 11f8111a01279b580ed2d1d4b8fd90d3dfbf9546 [diff] |
resolve merge conflicts of 11f8111 to master Change-Id: Ib87ffa239caeb4d326ae70fedeae9c22675cdfb5