| commit | b41e0e37ecb59eec14d09068d1d6ac953eea59ce | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Jun 12 22:02:32 2014 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Thu Jun 12 22:02:32 2014 +0200 |
| tree | 364c9d85e1df7427e360eeab5eb733ebdb2426d0 | |
| parent | 5da5e7a4812f3c2408da386688c96ad368ad1b72 [diff] | |
| parent | 44f8d455fe8177479ac1f620d724a21db176847c [diff] |
resolved conflicts for merge of 6edef668 to master Change-Id: Ia0c79581e9221341718799d2969f56c95a76a3de