| commit | 1e4250df552beca869aa4dfa236e788c3e1103bf | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Jun 21 15:46:48 2016 -0700 |
| committer | Felipe Leme <felipeal@google.com> | Tue Jun 21 15:46:48 2016 -0700 |
| tree | c03258e46de226a38a8f303e0374a1740bbb6a26 | |
| parent | 18d6db9a68246bdcfbc95aa312e3586902ffbdd2 [diff] | |
| parent | e7f9de787504d4c3dc0bdd5ffe14bd58471d5fcf [diff] |
resolve merge conflicts of e7f9de7 to master Change-Id: Ib28b9e0902c1e5ec29efa3764650b9d13b2372c7