| commit | 244f776855b2144a7fe16be09c67e5b189e8dcfd | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue Oct 20 23:48:55 2015 +0100 |
| committer | Michael Wright <michaelwr@google.com> | Tue Oct 20 23:48:55 2015 +0100 |
| tree | 8ed20c245054b48e22cabd3bf0a4fb64f4299729 | |
| parent | 44b54aff3a3263312d5fba6c494e9b9402825f9f [diff] | |
| parent | f013c3f1111df040a920d03a92aabb997945ef8e [diff] |
resolve merge conflicts of f013c3f111 to master. Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907