| commit | bead081e026dc21d65afa0d8c024f0f4a748af9f | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Jun 12 19:35:11 2014 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Thu Jun 12 19:35:52 2014 +0200 |
| tree | 9d548f8e2bdc25fba14c40390f8d0db62a6c812b | |
| parent | 15fab935102b2d2ba7743f26c2c1628f2dc924d4 [diff] | |
| parent | 598e05b2c0df7c0ad5a1dcf2577080715d6267c3 [diff] |
resolve merge conflicts of 598e05b to master. Change-Id: I1e393281f09fed776cf4d856f4858638287dd600