| commit | 87a537da1736aa2f11e2a2418127e83b92f4fdf5 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Oct 17 12:17:56 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Fri Oct 17 12:17:56 2014 +0100 |
| tree | cae82eb62ed5e65b74eb1cc8870b5007d9864571 | |
| parent | d16ca996aa9a8957d2cc00944bb1980412d4d6ef [diff] | |
| parent | 9e57177c2e74e5b0c52c19852e9caf5e0b0ada9e [diff] |
resolved conflicts for merge of 9e57177c to master Change-Id: I5e2291ef98f1bbae8074c14e3a5e53a3f3a4477f