| commit | 38b756e46f913cdbe07f81d38cbb05303f135493 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Wed Jul 13 08:37:35 2016 -0700 |
| committer | Etan Cohen <etancohen@google.com> | Wed Jul 13 09:02:38 2016 -0700 |
| tree | 3d3558a508a5eb7f9304f63d11ba0d1b6f6bec8a | |
| parent | 5efa985cf2821e2b33e8bf4d40c76c154c1cd0d3 [diff] | |
| parent | e27021e4c8c369554880ab522a1e27942b15687b [diff] |
resolve merge conflicts of e27021e to master Change-Id: Iebb3cdb6d210dbaf2905eafa5ce1b69ba428f0dc