| commit | 20ce5eff650cff5ccca554b4b188c9f65cd9f969 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Jun 11 18:00:26 2015 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Thu Jun 11 18:00:26 2015 +0100 |
| tree | 57100892c74ba47e2324eb7ac4711bdfe14538a0 | |
| parent | 06f62fadf99518aea34e48f5f5061b61c985951c [diff] | |
| parent | 8ba8178bcb1d6ddad10e802235d56c7e1610dd3b [diff] |
resolved conflicts for merge of 70be78a8 to master Change-Id: I0743be4b22602ad0255998d22cff345c36a60ecb